projects
/
invirt/packages/invirt-web.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
main.py: small Python style improvement
[invirt/packages/invirt-web.git]
/
code
/
main.fcgi
diff --git
a/code/main.fcgi
b/code/main.fcgi
index
cd10538
..
fa2681a
100755
(executable)
--- a/
code/main.fcgi
+++ b/
code/main.fcgi
@@
-4,15
+4,28
@@
import cherrypy
import os
import sys
import cherrypy
import os
import sys
-from main import InvirtWeb
+from main import InvirtWeb, InvirtUnauthWeb
dev = False
base_dir = os.path.dirname(__file__)
dev = False
base_dir = os.path.dirname(__file__)
-if __name__=="__main__":
+def usage():
+ print >>sys.stderr, """%s [config]
+
+Run server as FastCGI, with CherryPy config from "main.conf".
+
+With `config`, run standalone with CherryPy config from `config`.
+""" % sys.argv[0]
+ sys.exit(2)
+
+if __name__ == "__main__":
static_dir = os.path.join(base_dir, 'static')
static_dir = os.path.join(base_dir, 'static')
+ if len(sys.argv) > 2:
+ usage()
if len(sys.argv) > 1:
if len(sys.argv) > 1:
+ if sys.argv[1] in ('-h', '--help'):
+ usage()
conf_file = sys.argv[1]
dev = True
else:
conf_file = sys.argv[1]
dev = True
else:
@@
-25,6
+38,10
@@
if __name__=="__main__":
'tools.staticdir.dir': static_dir}
})
app.merge(conf_file)
'tools.staticdir.dir': static_dir}
})
app.merge(conf_file)
+ unauthApp = cherrypy.tree.mount(InvirtUnauthWeb(),
+ '/unauth',
+ {'/': {'tools.invirtwebstate.on': True}})
+ unauthApp.merge(conf_file)
cherrypy.config.update(conf_file)
if dev:
cherrypy.config.update(conf_file)
if dev:
@@
-34,5
+51,5
@@
if __name__=="__main__":
else:
cherrypy.engine.start(blocking=False)
from flup.server.fcgi import WSGIServer
else:
cherrypy.engine.start(blocking=False)
from flup.server.fcgi import WSGIServer
- server = WSGIServer(app)
+ server = WSGIServer(cherrypy.tree)
server.run()
server.run()