From 67a4de38f5286dade786eabdb00e16157af9f705 Mon Sep 17 00:00:00 2001 From: LV-426 Date: Mon, 30 Mar 2015 19:08:50 +0300 Subject: rz_api: deprecating, removing __common_exec() --- src/server/rz_api.py | 15 --------------- src/server/rz_server.py | 1 - 2 files changed, 16 deletions(-) diff --git a/src/server/rz_api.py b/src/server/rz_api.py index 2217e4e2..b4ad5e5e 100644 --- a/src/server/rz_api.py +++ b/src/server/rz_api.py @@ -26,21 +26,6 @@ from neo4j_cypher import QT_Node_Filter__Doc_ID_Label log = logging.getLogger('rhizi') -db_ctl = None # injected: DB controller - -def __common_exec(op, on_success=common_resp_handle, on_error=common_resp_handle): - """ - @param on_success: should return a Flask Response object - @param on_error: should return a Flask Response object - """ - try: - op_ret = db_ctl.exec_op(op) - return on_success(op_ret) - except Exception as e: - log.error(e.message) - log.error(traceback.print_exc()) - return on_error(error='error occurred') - def index(): # fetch rz_username for welcome message diff --git a/src/server/rz_server.py b/src/server/rz_server.py index 0fc93df1..ee2f2899 100644 --- a/src/server/rz_server.py +++ b/src/server/rz_server.py @@ -284,7 +284,6 @@ def init_webapp(cfg, kernel, db_ctl=None): if None == db_ctl: db_ctl = dbc.DB_Controller(cfg) - rz_api.db_ctl = db_ctl rz_api_rest.db_ctl = db_ctl kernel.db_ctl = db_ctl -- cgit v1.3.1