From 758190f775b765583de61f5ce5e657ea60ac3302 Mon Sep 17 00:00:00 2001 From: LV-426 Date: Fri, 2 Jan 2015 17:45:22 +0200 Subject: rhizi_api.py: extract core logic to rz_kernel (REST/web-socket agnostic) --- src/server/rhizi_server_fcgi.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'src/server/rhizi_server_fcgi.py') diff --git a/src/server/rhizi_server_fcgi.py b/src/server/rhizi_server_fcgi.py index f0b9a04b..b3985ee1 100755 --- a/src/server/rhizi_server_fcgi.py +++ b/src/server/rhizi_server_fcgi.py @@ -6,19 +6,20 @@ import sys import cgitb import rhizi_server +from rz_kernel import RZ_Kernel + # sys.path.insert(0, '/srv/www/rhizi/rhizi.net/src-py') # enable debugging cgitb.enable() if __name__ == '__main__': - cfg_dir = '/etc/rhizi' - - cfg = rhizi_server.init_config(os.path.join(cfg_dir, 'rhizi-server.conf')) - log = rhizi_server.init_log() + cfg = rhizi_server.init_config(cfg_dir='/etc/rhizi') + log = rhizi_server.init_log(cfg) - webapp = rhizi_server.init_webapp(cfg) - rhizi_server.init_rest_api(cfg, webapp) + kernel = RZ_Kernel() + webapp = rhizi_server.init_webapp(cfg, kernel) + rhizi_server.init_rest_interface(cfg, webapp) log.info('launching webapp via flup.server.fcgi.WSGIServer') -- cgit v1.3.1