diff options
| author | LV-426 <lv-426@taproot.org.il> | 2015-01-06 18:10:22 +0200 |
|---|---|---|
| committer | LV-426 <lv-426@taproot.org.il> | 2015-01-06 18:10:22 +0200 |
| commit | fef119ddaeabc3ada0a67575c94739b96a79954f (patch) | |
| tree | 015f59d525870556ca1770cde650485babb6a68d /src | |
| parent | a1425f18502e2e4775d156ebf9c5aad89b247e2a (diff) | |
rz_kernel: mv db_ctl reference to kernel
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/rz_api_rest.py | 4 | ||||
| -rw-r--r-- | src/server/rz_kernel.py | 8 | ||||
| -rw-r--r-- | src/server/rz_server.py | 1 |
3 files changed, 7 insertions, 6 deletions
diff --git a/src/server/rz_api_rest.py b/src/server/rz_api_rest.py index f6bbb58a..30f07635 100644 --- a/src/server/rz_api_rest.py +++ b/src/server/rz_api_rest.py @@ -76,7 +76,7 @@ def diff_commit__topo(): try: kernel = flask.current_app.kernel - topo_diff = kernel.diff_commit__topo(db_ctl, topo_diff) + topo_diff = kernel.diff_commit__topo(topo_diff) topo_diff_json = topo_diff.to_json_dict() return __common_resp_handle(data=topo_diff_json) except Exception as e: @@ -107,7 +107,7 @@ def diff_commit__attr(): try: kernel = flask.current_app.kernel - attr_diff = kernel.diff_commit__attr(db_ctl, attr_diff) + attr_diff = kernel.diff_commit__attr(attr_diff) return __common_resp_handle(data=attr_diff) except Exception as e: log.error(e.message) diff --git a/src/server/rz_kernel.py b/src/server/rz_kernel.py index 75fc959a..41106ba5 100644 --- a/src/server/rz_kernel.py +++ b/src/server/rz_kernel.py @@ -11,7 +11,7 @@ log = logging.getLogger('rhizi') class RZ_Kernel(object): - def diff_commit__topo(self, db_ctl, topo_diff): + def diff_commit__topo(self, topo_diff): """ commit a graph topology diff - this is a common pathway for: - RESP API calls @@ -20,17 +20,17 @@ class RZ_Kernel(object): """ op = DBO_diff_commit__topo(topo_diff) try: - op_ret = db_ctl.exec_op(op) + op_ret = self.db_ctl.exec_op(op) return op_ret except Exception as e: log.error(e.message) log.error(traceback.print_exc()) raise e - def diff_commit__attr(self, db_ctl, attr_diff): + def diff_commit__attr(self, attr_diff): op = DBO_diff_commit__attr(attr_diff) try: - op_ret = db_ctl.exec_op(op) + op_ret = self.db_ctl.exec_op(op) return op_ret except Exception as e: log.error(e.message) diff --git a/src/server/rz_server.py b/src/server/rz_server.py index f2dc2f32..e1b5f34d 100644 --- a/src/server/rz_server.py +++ b/src/server/rz_server.py @@ -240,6 +240,7 @@ def init_webapp(cfg, kernel, db_ctl=None): db_ctl = dbc.DB_Controller(cfg) rz_api.db_ctl = db_ctl rz_api_rest.db_ctl = db_ctl + kernel.db_ctl = db_ctl webapp.rz_config = cfg webapp.kernel = kernel |