diff --git a/product/CMFActivity/ActiveProcess.py b/product/CMFActivity/ActiveProcess.py index ab21db551363ed9a6cdf8cebea71fd2f13ba1a3d..2a72e197b7e3384651f606e6ef6a8ccc6558e639 100755 --- a/product/CMFActivity/ActiveProcess.py +++ b/product/CMFActivity/ActiveProcess.py @@ -57,7 +57,7 @@ class ActiveProcess(Base): """ meta_type='CMF Active Process' - portal_type=None # may be useful in the future... + portal_type='Active Process' isPortalContent = 0 isRADContent = 1 icon = None @@ -94,7 +94,7 @@ class ActiveProcess(Base): """ Returns the list of errors as text """ - return '\n'.join(self.error_list) + return '\n'.join(map(lambda x:repr(x), self.error_list)) security.declareProtected(CMFCorePermissions.ManagePortal, 'activateResult') def activateResult(self, result): diff --git a/product/CMFActivity/ActivityTool.py b/product/CMFActivity/ActivityTool.py index a562dd73a2819fedbbb0c0c322d7a1b635e22646..3a80592f13c980338a0cd9d3e8f089d3a298c771 100755 --- a/product/CMFActivity/ActivityTool.py +++ b/product/CMFActivity/ActivityTool.py @@ -144,6 +144,7 @@ class ActivityTool (Folder, UniqueObject): """ id = 'portal_activities' meta_type = 'CMF Activity Tool' + portal_type = 'Activity Tool' allowed_types = ( 'CMF Active Process', ) security = ClassSecurityInfo() @@ -245,8 +246,13 @@ class ActivityTool (Folder, UniqueObject): active_threads -= 1 tic_lock.release() - def hasActivity(self, object, **kw): + def hasActivity(self, *args, **kw): # Check in each queue if the object has deferred tasks + # if not argument is provided, then check on self + if len(args) > 0: + object = args[0] + else: + object = self for activity in activity_list: if activity.hasActivity(self, object, **kw): return 1 @@ -310,11 +316,13 @@ class ActivityTool (Folder, UniqueObject): return message_list security.declareProtected( CMFCorePermissions.ManagePortal , 'newActiveProcess' ) - def newActiveProcess(self): + def newActiveProcess(self, **kw): from ActiveProcess import addActiveProcess new_id = str(self.generateNewId()) addActiveProcess(self, new_id) - return self._getOb(new_id) + active_process = self._getOb(new_id) + active_process.edit(**kw) + return active_process def reindexObject(self): self.immediateReindexObject() diff --git a/product/CMFActivity/zope_distribute_loop b/product/CMFActivity/zope_distribute_loop index a1ff93caae6b682816ef020022c3ccc3eb9f4fd5..008bf67d6e7e75e62979b54a5d9de91de2f0e007 100755 --- a/product/CMFActivity/zope_distribute_loop +++ b/product/CMFActivity/zope_distribute_loop @@ -1,9 +1,15 @@ #!/bin/bash while true; do -wget -O /tmp/zope_distribute.out http://jp:jp@localhost:9573/coramy/portal_activities/distribute?node_count:int=3 & +wget -O /tmp/zope_distribute.out http://jp:jp@192.1.2.151:9473/coramy/portal_activities/distribute?node_count:int=1 & #wget -O /tmp/zope_distribute.out http://jp:jp@localhost:9573/coramy/portal_activities/distribute?node_count:int=1 & -wget -O /tmp/zope_tic1.out http://jp:jp@localhost:9573/coramy/portal_activities/tic?processing_node:int=1 & -wget -O /tmp/zope_tic2.out http://jp:jp@192.1.2.150:9473/coramy/portal_activities/tic?processing_node:int=2 & -wget -O /tmp/zope_tic3.out http://jp:jp@192.1.2.150:9573/coramy/portal_activities/tic?processing_node:int=3 & +#wget -O /tmp/zope_distribute.out http://jp:jp@localhost:9573/coramy/portal_activities/distribute?node_count:int=3 & +#wget -O /tmp/zope_distribute.out http://jp:jp@192.1.2.150:9573/coramy/portal_activities/distribute?node_count:int=1 & +#wget -O /tmp/zope_distribute.out http://jp:jp@192.1.2.150:9573/coramy/portal_activities/distribute?node_count:int=4 & +#wget -O /tmp/zope_tic1.out http://jp:jp@localhost:9573/coramy/portal_activities/tic?processing_node:int=1 & +wget -O /tmp/zope_tic2.out http://jp:jp@192.1.2.151:9473/coramy/portal_activities/tic?processing_node:int=1 +#wget -O /tmp/zope_tic2.out http://jp:jp@192.1.2.150:9473/coramy/portal_activities/tic?processing_node:int=1 & +#wget -O /tmp/zope_tic3.out http://jp:jp@192.1.2.150:9573/coramy/portal_activities/tic?processing_node:int=2 & +#wget -O /tmp/zope_tic2.out http://jp:jp@192.1.2.151:9473/coramy/portal_activities/tic?processing_node:int=3 & +#wget -O /tmp/zope_tic2.out http://jp:jp@192.1.2.152:9473/coramy/portal_activities/tic?processing_node:int=4 & sleep 5 done