From fb5279c841a053d28374ab4550e7ec9141f6d4dd Mon Sep 17 00:00:00 2001 From: LV-426 Date: Mon, 4 May 2015 21:39:43 +0300 Subject: rz_kernel: manage DB session, initialization --- src/server/rz_server.py | 28 ---------------------------- 1 file changed, 28 deletions(-) (limited to 'src/server/rz_server.py') diff --git a/src/server/rz_server.py b/src/server/rz_server.py index e5958d37..dc7d8f74 100644 --- a/src/server/rz_server.py +++ b/src/server/rz_server.py @@ -13,7 +13,6 @@ import signal import traceback import types -import db_controller as dbc from db_op import DBO_rzdb__fetch_DB_metablock, DBO_rzdb__init_DB import rz_api import rz_api_rest @@ -434,27 +433,6 @@ def init_config(cfg_dir): cfg = Config.init_from_file(cfg_path) return cfg -def init_DB(cfg): - db_ctl = dbc.DB_Controller(cfg) - op_probe = DBO_rzdb__fetch_DB_metablock(cfg) - - try: - dbmb = db_ctl.exec_op(op_probe) - if dbmb is None: - log.warning('detected uninitialized DB, initializing') - op_init = DBO_rzdb__init_DB(cfg) - db_ctl.exec_op(op_init) - op_probe = DBO_rzdb__fetch_DB_metablock(cfg) # reprobe for metablock - dbmb = db_ctl.exec_op(op_probe) - log.info('DB initialized, schema-version: %s' % (dbmb['schema_version'])) - else: - log.info('DB connection established, schema-version: %s' % (dbmb['schema_version'])) - except Exception as e: - log.exception('failed to init DB') - raise e - - return db_ctl - def init_user_db(cfg): global user_db @@ -532,12 +510,6 @@ if __name__ == "__main__": # kernel = RZ_Kernel() - # - # init DB controller - # - - kernel.db_ctl = init_DB(cfg) - # # init webapp # -- cgit v1.3.1