Changeset 2655 for package_branches/invirt-web/cherrypy/code/invirt.fcgi

Timestamp:

Dec 20, 2009, 8:26:02 PM (14 years ago)

Author:

price

Message:

Deduplicate the code in auth.fcgi and unauth.fcgi

But call the reunited code "invirt.fcgi" rather than the old "main.fcgi",
which was always annoying for tab-completion against "main.py".

File:

• package_branches/invirt-web/cherrypy/code/invirt.fcgi (copied) (copied from package_branches/invirt-web/cherrypy/code/unauth.fcgi) (3 diffs, 1 prop)

package_branches/invirt-web/cherrypy/code/invirt.fcgi

@@ -1 +1 @@
 #!/usr/bin/python
-"""Main FastCGI entry point for unauthenticated web interface"""
+"""Main FastCGI entry point for web interface"""
 
 import cherrypy
 import os
 import sys
-from main import InvirtUnauthWeb
+
+import main
 
 dev = False
@@ -16 +17 @@
 
 With `config`, run standalone with CherryPy config from `config`.
+
+Run this script as either 'auth.fcgi' or 'unauth.fcgi', to get
+the authenticated or unauthenticated site respectively.
 """ % sys.argv[0]
     sys.exit(2)
@@ -35 +39 @@
             },
         }
-                    
-    app = cherrypy.tree.mount(InvirtUnauthWeb(),
-                              '/',
-                              app_config)
+
+    if os.path.basename(sys.argv[0]).startswith('auth'):
+        root = InvirtWeb()
+    elif os.path.basename(sys.argv[0]).startswith('unauth'):
+        root = InvirtUnauthWeb()
+    else:
+        usage()
+
+    app = cherrypy.tree.mount(root, '/', app_config)
     app.merge(conf_file)
     cherrypy.config.update(conf_file)