Commit c9c06dda authored by Hardik Juneja's avatar Hardik Juneja

CMFActivity: rename activateResult to storeResult

parent 33bb3a8f
...@@ -117,12 +117,7 @@ class SQLBase(Queue): ...@@ -117,12 +117,7 @@ class SQLBase(Queue):
" The following added columns could not be initialized: %s" " The following added columns could not be initialized: %s"
% (self.sql_table, ", ".join(column_list))) % (self.sql_table, ", ".join(column_list)))
def register(self, activity_buffer, activity_tool, message): def storeResult(self, activity_tool, active_process, result):
activity_buffer.register(activity_tool)
assert not message.is_registered, message
self.registerMessage(activity_buffer, activity_tool, message)
def activateResult(self, active_process, result, signature=None):
active_process.appendResult(result) active_process.appendResult(result)
def prepareQueueMessageList(self, activity_tool, message_list): def prepareQueueMessageList(self, activity_tool, message_list):
......
...@@ -87,7 +87,8 @@ class SQLJoblib(SQLDict): ...@@ -87,7 +87,8 @@ class SQLJoblib(SQLDict):
self.activity_tool = activity_tool self.activity_tool = activity_tool
self.prepareMessage(activity_tool, message) self.prepareMessage(activity_tool, message)
def activateResult(self, active_process, result, signature): def storeResult(self, message, active_process, result):
signature = message.activity_kw['signature']
result.signature = int(signature) result.signature = int(signature)
active_process.setResult(result) active_process.setResult(result)
......
...@@ -294,8 +294,7 @@ class Message(BaseMessage): ...@@ -294,8 +294,7 @@ class Message(BaseMessage):
if not hasattr(self, 'activity'): if not hasattr(self, 'activity'):
self.activity = DEFAULT_ACTIVITY self.activity = DEFAULT_ACTIVITY
result.edit(object_path=object, method_id=self.method_id) result.edit(object_path=object, method_id=self.method_id)
signature = getattr(self, 'signature', None) activity_dict[self.activity].storeResult(self, active_process, result)
activity_dict[self.activity].activateResult(active_process, result, signature)
def __call__(self, activity_tool): def __call__(self, activity_tool):
try: try:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment