diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/server-tests/test_db_controller.py | 4 | ||||
| -rw-r--r-- | src/server-tests/test_neo4j_cypher.py | 4 | ||||
| -rw-r--r-- | src/server-tests/test_rhizi_api.py | 4 | ||||
| -rw-r--r-- | src/server-tests/test_rzdoc.py | 4 | ||||
| -rw-r--r-- | src/server/rz_config.py | 8 | ||||
| -rw-r--r-- | src/server/rz_server.py | 9 |
6 files changed, 16 insertions, 17 deletions
diff --git a/src/server-tests/test_db_controller.py b/src/server-tests/test_db_controller.py index 89503e1a..27275f08 100644 --- a/src/server-tests/test_db_controller.py +++ b/src/server-tests/test_db_controller.py @@ -21,7 +21,7 @@ from neo4j_test_util import DBO_random_data_generation import neo4j_test_util from neo4j_util import Neo4JException from neo4j_util import meta_attr_list_to_meta_attr_map -from rz_config import Config +from rz_config import RZ_Config from test_util import generate_random_link_dict from test_util import generate_random_node_dict from test_util__pydev import debug__pydev_pd_arg @@ -358,7 +358,7 @@ class TestDBController(unittest.TestCase): self.assertTrue(0 < len(l_set)) def test_rzdb__init_DB(self): - rz_cfg = Config.generate_default() + rz_cfg = RZ_Config.generate_default() op = DBO_rzdb__init_DB(rz_cfg.rzdoc__mainpage_name) try: # assert first init call passes self.db_ctl.exec_op(op) diff --git a/src/server-tests/test_neo4j_cypher.py b/src/server-tests/test_neo4j_cypher.py index 49f5f224..1c4daae8 100644 --- a/src/server-tests/test_neo4j_cypher.py +++ b/src/server-tests/test_neo4j_cypher.py @@ -11,7 +11,7 @@ from neo4j_cypher import Cypher_Parser, DB_Query from neo4j_qt import QT_RZDOC_NS_Filter import neo4j_test_util from neo4j_util import meta_attr_list_to_meta_attr_map -from rz_config import Config +from rz_config import RZ_Config from rz_server import init_log from test_util import generate_random_node_dict, generate_random_link_dict, \ generate_random_RZDoc @@ -22,7 +22,7 @@ class Test_DB_Op(unittest.TestCase): @classmethod def setUpClass(self): - cfg = Config.init_from_file('res/etc/rhizi-server.conf') + cfg = RZ_Config.init_from_file('res/etc/rhizi-server.conf') self.log = init_log(cfg) def setUp(self): diff --git a/src/server-tests/test_rhizi_api.py b/src/server-tests/test_rhizi_api.py index 694f8d32..67a67220 100644 --- a/src/server-tests/test_rhizi_api.py +++ b/src/server-tests/test_rhizi_api.py @@ -7,7 +7,7 @@ from werkzeug.test import EnvironBuilder import db_controller as dbc from db_op import DBO_cypher_query import rz_api -from rz_config import Config +from rz_config import RZ_Config from test_util__pydev import debug__pydev_pd_arg @@ -18,7 +18,7 @@ class TestRhiziAPI(unittest.TestCase): @classmethod def setUpClass(self): - cfg = Config.init_from_file('res/etc/rhizi-server.conf') + cfg = RZ_Config.init_from_file('res/etc/rhizi-server.conf') self.db_ctl = dbc.DB_Controller(cfg.db_base_url) rz_api.db_ctl = self.db_ctl diff --git a/src/server-tests/test_rzdoc.py b/src/server-tests/test_rzdoc.py index d9c7cefa..a9c61873 100644 --- a/src/server-tests/test_rzdoc.py +++ b/src/server-tests/test_rzdoc.py @@ -3,7 +3,7 @@ import unittest import db_controller import neo4j_test_util -from rz_config import Config +from rz_config import RZ_Config from rz_kernel import RZ_Kernel import test_util from test_util__pydev import debug__pydev_pd_arg @@ -13,7 +13,7 @@ class TestRZDoc(unittest.TestCase): @classmethod def setUpClass(self): - cfg = Config.init_from_file('res/etc/rhizi-server.conf') + cfg = RZ_Config.init_from_file('res/etc/rhizi-server.conf') self.db_ctl = db_controller.DB_Controller(cfg.db_base_url) self.log = logging.getLogger('rhizi') self.log.addHandler(logging.StreamHandler()) 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): |