diff options
Diffstat (limited to 'src/server')
| -rw-r--r-- | src/server/rz_kernel.py | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/server/rz_kernel.py b/src/server/rz_kernel.py index 52a03d1f..c3cb43ae 100644 --- a/src/server/rz_kernel.py +++ b/src/server/rz_kernel.py @@ -103,6 +103,20 @@ class RZ_Kernel(object): self.db_conn_avail = False self.db_metablock = None + def _exec_chain_commit_op(self, diff_obj, ctx, meta=None): + + # FIXME: clean + if isinstance(diff_obj, Topo_Diff): + commit_obj = diff_obj.to_json_dict() + else: + commit_obj = diff_obj + + rzdoc = ctx.rzdoc + op = DBO_block_chain__commit(commit_obj, ctx, meta) + op = QT_RZDOC_Meta_NS_Filter(rzdoc)(op) + op_ret = self.db_ctl.exec_op(op) + return op_ret.meta['ts_created'] + def start(self): def kernel_heartbeat(): @@ -206,7 +220,7 @@ class RZ_Kernel(object): op = QT_RZDOC_NS_Filter(rzdoc)(op) op_ret = self.db_ctl.exec_op(op) - ts_created = self.exec_chain_commit_op(topo_diff, ctx, topo_diff.meta) + ts_created = self._exec_chain_commit_op(topo_diff, ctx, topo_diff.meta) topo_diff.meta['author'] = ctx.user_name topo_diff.meta['ts_created'] = ts_created op_ret['meta'] = topo_diff.meta @@ -226,25 +240,11 @@ class RZ_Kernel(object): op = QT_RZDOC_NS_Filter(rzdoc)(op) op_ret = self.db_ctl.exec_op(op) - ts_created = self.exec_chain_commit_op(attr_diff, ctx) + ts_created = self._exec_chain_commit_op(attr_diff, ctx) attr_diff.meta['author'] = ctx.user_name attr_diff.meta['ts_created'] = ts_created return attr_diff, op_ret - def exec_chain_commit_op(self, diff_obj, ctx, meta=None): - - # FIXME: clean - if isinstance(diff_obj, Topo_Diff): - commit_obj = diff_obj.to_json_dict() - else: - commit_obj = diff_obj - - rzdoc = ctx.rzdoc - op = DBO_block_chain__commit(commit_obj, ctx, meta) - op = QT_RZDOC_Meta_NS_Filter(rzdoc)(op) - op_ret = self.db_ctl.exec_op(op) - return op_ret.meta['ts_created'] - def load_node_set_by_id_attr(self, id_set, ctx=None): op = DBO_match_node_set_by_id_attribute(id_set=id_set) self.db_ctl.exec_op(op) |