Merge lp:~deuns-martinez/loggerhead/flup into lp:loggerhead

[Denis Martinez]

[Denis Martinez (deuns-martinez)]

Proposal to add FastCGI, SCGI and AJP support using flup.
This makes it usable under the Cherokee web server and others.

[Matt Nordhoff (mnordhoff)]

This looks nice to be, though I don't want to set up something to test it.

The (optional) flup dependency should be added to the README, but that's something than can be done when it's merged.

39 + return

That should be sys.exit(1), IMO.

[Robert Collins (lifeless)]

Matt, why sys.exit(1) rather than return? to get a non-zero exit code?

[Matt Nordhoff (mnordhoff)]

(Oops, didn't see this email.)

Robert Collins wrote:
> Matt, why sys.exit(1) rather than return? to get a non-zero exit code?

Yeah. Plus, it's consistent with the other code.

[Martin Albisetti (beuno)]

Denis, could you tweak these bits so we can merge?

[Denis Martinez (deuns-martinez)]

Alright, it's done.

[Matt Nordhoff (mnordhoff)]

I already tweaked and landed it. Sorry.

(Except I made an error, which I just noticed when looking at your patch, and fixed. Thanks!)

(I can never land anything without doing one little fix after-the-fact. Darnit!)

review: Disapprove

Unmerged revisions

395. By Denis Martinez on 2009-11-27

sys.exit(1) instead of return

=== modified file 'loggerhead/main.py'
--- loggerhead/main.py	2009-11-27 18:06:53 +0000
+++ loggerhead/main.py	2009-11-27 18:15:22 +0000
@@ -166,6 +166,11 @@
         elif protocol == 'ajp':
             from flup.server.ajp import WSGIServer
         else:
+<<<<<<< TREE
             print 'Unknown protocol: %s.' % (protocol)
             sys.exit(0)
+=======
+            print >> sys.stderr, 'Unknown protocol: %s.' % (protocol)
+            sys.exit(1)
+>>>>>>> MERGE-SOURCE
         WSGIServer(app, bindAddress=(host, int(port))).run()