From b369bde45d958ae77f874a73b9866f3a511ed344 Mon Sep 17 00:00:00 2001 From: LV-426 Date: Tue, 5 May 2015 00:03:17 +0300 Subject: DB_Controller: refactor rz_config dep -> rz_config.rest_api_base_url --- src/server/db_controller.py | 5 ++--- src/server/rz_kernel.py | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'src/server') diff --git a/src/server/db_controller.py b/src/server/db_controller.py index f10c7964..82160037 100644 --- a/src/server/db_controller.py +++ b/src/server/db_controller.py @@ -15,10 +15,9 @@ class DB_Controller: """ neo4j DB controller """ - def __init__(self, config, db_driver_class=None): - self.config = config + def __init__(self, rest_api_base_url, db_driver_class=None): if not db_driver_class: - self.db_driver = DB_Driver_REST(self.config.db_base_url) + self.db_driver = DB_Driver_REST(rest_api_base_url) else: self.db_driver = db_driver_class() assert isinstance(self.db_driver, DB_Driver_Base) diff --git a/src/server/rz_kernel.py b/src/server/rz_kernel.py index f331ac5c..4e6f920d 100644 --- a/src/server/rz_kernel.py +++ b/src/server/rz_kernel.py @@ -93,7 +93,7 @@ class RZ_Kernel(object): self.cfg = cfg self.cache__rzdoc_name_to_rzdoc = {} self.heartbeat_period_sec = 0.5 - self.db_ctl = DB_Controller(cfg) + self.db_ctl = DB_Controller(cfg.db_base_url) self.period__db_conn_check = 60 self.rzdoc_reader_assoc_map = defaultdict(list) -- cgit v1.3.1