rhizi .fcgi script - renamed on deployment

1 files changed, 16 insertions, 7 deletions

diff --git a/src-py/rhizi_server_fcgi.py b/src-py/rhizi_server_fcgi.py
index 917c7ce4..bda8d91c 100644..100755
--- a/src-py/rhizi_server_fcgi.py
+++ b/src-py/rhizi_server_fcgi.py
@@ -1,15 +1,24 @@
 #!/usr/bin/python
 
 from flup.server.fcgi import WSGIServer
-import rhizi_api
 import os
-import db_controller as dbc
-from rhizi_server import Config
+import sys
+import cgitb
+import rhizi_server
+
+# sys.path.insert(0, '/srv/www/rhizi/rhizi.net/src-py')
+
+# enable debugging
+cgitb.enable()
 
 if __name__ == '__main__':
     cfg_dir = '/etc/rhizi'
-    cfg = Config.init_from_file(os.path.join(cfg_dir, 'rhizi-server.conf'))
+    cfg = rhizi_server.Config.init_from_file(os.path.join(cfg_dir, 'rhizi-server.conf'))
+
+    log = rhizi_server.init_logging()
+    webapp = rhizi_server.init_webapp(cfg)
+    rhizi_server.init_rest_api(webapp)
+
+    log.info('launching webapp via flup.server.fcgi.WSGIServer')
 
-    db_ctl = dbc.DB_Controller(cfg)
-    rhizi_api.db_ctl = db_ctl
-    WSGIServer(rhizi_api.webapp).run()
+    WSGIServer(webapp).run()