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

Proposed by Denis Martinez on 2009-11-27
Status: Rejected
Rejected by: Matt Nordhoff on 2009-11-29
Proposed branch: lp:~deuns-martinez/loggerhead/flup
Merge into: lp:loggerhead
Diff against target: 15 lines (+5/-0)
1 file modified
loggerhead/main.py (+5/-0)
To merge this branch: bzr merge lp:~deuns-martinez/loggerhead/flup
Reviewer Review Type Date Requested Status
Matt Nordhoff 2009-11-27 Disapprove on 2009-11-27
Review via email: mp+15331@code.launchpad.net

This proposal supersedes a proposal from 2009-11-23.

To post a comment you must log in.
Denis Martinez (deuns-martinez) wrote : Posted in a previous version of this proposal

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

Matt Nordhoff (mnordhoff) wrote : Posted in a previous version of this proposal

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) wrote : Posted in a previous version of this proposal

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

Matt Nordhoff (mnordhoff) wrote : Posted in a previous version of this proposal

(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) wrote : Posted in a previous version of this proposal

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

Denis Martinez (deuns-martinez) wrote : Posted in a previous version of this proposal

Alright, it's done.

Matt Nordhoff (mnordhoff) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'loggerhead/main.py'
2--- loggerhead/main.py 2009-11-27 18:06:53 +0000
3+++ loggerhead/main.py 2009-11-27 18:15:22 +0000
4@@ -166,6 +166,11 @@
5 elif protocol == 'ajp':
6 from flup.server.ajp import WSGIServer
7 else:
8+<<<<<<< TREE
9 print 'Unknown protocol: %s.' % (protocol)
10 sys.exit(0)
11+=======
12+ print >> sys.stderr, 'Unknown protocol: %s.' % (protocol)
13+ sys.exit(1)
14+>>>>>>> MERGE-SOURCE
15 WSGIServer(app, bindAddress=(host, int(port))).run()

Subscribers

People subscribed via source and target branches