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?

[lp:~deuns-martinez/loggerhead/flup]

395. By Denis Martinez on 2009-11-27

sys.exit(1) instead of return

[Denis Martinez (deuns-martinez)]

Alright, it's done.

Unmerged revisions

395. By Denis Martinez on 2009-11-27

sys.exit(1) instead of return

=== modified file 'loggerhead/config.py'
--- loggerhead/config.py	2009-10-17 08:47:38 +0000
+++ loggerhead/config.py	2009-11-23 22:55:19 +0000
@@ -46,6 +46,9 @@
                             "(defaults to 8080)."))
     parser.add_option("--host", dest="user_host",
                       help="Host Loggerhead should listen on.")
+    parser.add_option("--protocol", dest="protocol",
+                      help=("Protocol to use: http, scgi, fcgi, ajp"
+                           "(defaults to http)."))
     parser.add_option("--memory-profile", action="store_true",
                       help="Profile the memory usage using Dozer.")
     parser.add_option("--prefix", dest="user_prefix",

=== modified file 'loggerhead/main.py'
--- loggerhead/main.py	2009-10-17 06:35:33 +0000
+++ loggerhead/main.py	2009-11-23 22:55:19 +0000
@@ -151,4 +151,21 @@
     else:
         host = config.get_option('user_host')
 
-    httpserver.serve(app, host=host, port=port)
+    if not config.get_option('protocol'):
+        protocol = 'http'
+    else:
+        protocol = config.get_option('protocol')
+
+    if protocol == 'http':
+        httpserver.serve(app, host=host, port=port)
+    else:
+        if protocol == 'fcgi':
+            from flup.server.fcgi import WSGIServer
+        elif protocol == 'scgi':
+            from flup.server.scgi import WSGIServer
+        elif protocol == 'ajp':
+            from flup.server.ajp import WSGIServer
+        else:
+            print >> sys.stderr, 'Unknown protocol: %s.' % (protocol)
+            return
+        WSGIServer(app, bindAddress=(host, int(port))).run()