diff options
| author | LV-426 <lv-426@taproot.org.il> | 2015-05-05 21:14:13 +0300 |
|---|---|---|
| committer | LV-426 <lv-426@taproot.org.il> | 2015-05-12 14:59:05 +0300 |
| commit | f28c6af4846a3fa31e80ddf218acf433290930b0 (patch) | |
| tree | 9b71a6fb6d5db2a00070f4919e0ea4aa9d76dc94 /src/server/rz_server.py | |
| parent | fecd18c77b8b991f7cb9e1eda052c78f5a419d0d (diff) | |
rename: config -> rz_config
Diffstat (limited to 'src/server/rz_server.py')
| -rw-r--r-- | src/server/rz_server.py | 9 |
1 files changed, 4 insertions, 5 deletions
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): |