Commit ee96a7fd authored by Aurel's avatar Aurel

use tag for activities dependencies instead of method_id

parent 17e573cc
...@@ -1001,4 +1001,5 @@ class SyncMLSubscription(XMLObject): ...@@ -1001,4 +1001,5 @@ class SyncMLSubscription(XMLObject):
method_kw={"no_conflict": True}, method_kw={"no_conflict": True},
min_depth=1, min_depth=1,
max_depth=1, max_depth=1,
activate_kw={'priority': ACTIVITY_PRIORITY}) activate_kw={'priority': ACTIVITY_PRIORITY,
'tag' : "%s_reset" % self.getPath()})
...@@ -453,8 +453,7 @@ class EngineMixin(object): ...@@ -453,8 +453,7 @@ class EngineMixin(object):
if subscriber.getIsActivityEnabled(): if subscriber.getIsActivityEnabled():
subscriber.activate( subscriber.activate(
activity="SQLQueue", activity="SQLQueue",
after_method_id_list=("reset", after_tag = "%s_reset" % subscriber.getPath(),
"_recurseCallMethod"),
# Wait for all reset to be done # Wait for all reset to be done
# before starting sync # before starting sync
priority=ACTIVITY_PRIORITY, priority=ACTIVITY_PRIORITY,
......
...@@ -379,8 +379,7 @@ class SynchronizationTool(BaseTool): ...@@ -379,8 +379,7 @@ class SynchronizationTool(BaseTool):
# XXX This must depends on activity enables property, maybe use engine # XXX This must depends on activity enables property, maybe use engine
if subscription.getIsActivityEnabled(): if subscription.getIsActivityEnabled():
subscription.activate( subscription.activate(
after_method_id_list=("reset", after_tag="%s_reset" %(subscription.getPath(),),
"_recurseCallMethod"),
activity="SQLQueue", activity="SQLQueue",
priority=ACTIVITY_PRIORITY, priority=ACTIVITY_PRIORITY,
tag=subscription.getRelativeUrl()).sendMessage(str(syncml_response)) tag=subscription.getRelativeUrl()).sendMessage(str(syncml_response))
......
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