diff options
Diffstat (limited to 'src/server')
| -rw-r--r-- | src/server/rz_config.py | 8 | ||||
| -rw-r--r-- | src/server/rz_server.py | 9 |
2 files changed, 8 insertions, 9 deletions
diff --git a/src/server/rz_config.py b/src/server/rz_config.py index 65931544..4e7efa15 100644 --- a/src/server/rz_config.py +++ b/src/server/rz_config.py @@ -1,8 +1,8 @@ import os import re +import types - -class Config(object): +class RZ_Config(object): """ rhizi-server configuration @@ -81,7 +81,7 @@ class Config(object): cfg['rzdoc__mainpage_name'] = 'Welcome Rhizi' cfg['rzdoc__name__max_length'] = 256 - ret = Config() + ret = RZ_Config() ret.__dict__ = cfg # allows setting of @property attributes return ret @@ -91,7 +91,7 @@ class Config(object): if False == os.path.exists(file_path): raise Exception('config file not found: ' + file_path) - cfg = Config.generate_default() + cfg = RZ_Config.generate_default() cfg.config_dir = os.path.abspath(os.path.dirname(file_path)) # bypass prop restriction with open(file_path, 'r') as f: diff --git a/src/server/rz_server.py b/src/server/rz_server.py index 7578fd12..56dc18a8 100644 --- a/src/server/rz_server.py +++ b/src/server/rz_server.py @@ -8,17 +8,16 @@ from flask import session from functools import wraps import logging import os -import re import signal import traceback -import types + from db_controller import DB_Controller -from db_op import DBO_rzdb__fetch_DB_metablock, DBO_rzdb__init_DB +from db_op import DBO_rzdb__init_DB import rz_api import rz_api_rest import rz_blob -from rz_config import Config +from rz_config import RZ_Config import rz_feedback from rz_kernel import RZ_Kernel from rz_mesh import init_ws_interface @@ -273,7 +272,7 @@ def init_webapp(cfg, kernel): def init_config(cfg_dir): cfg_path = os.path.join(cfg_dir, 'rhizi-server.conf') - cfg = Config.init_from_file(cfg_path) + cfg = RZ_Config.init_from_file(cfg_path) return cfg def init_user_db(cfg): |