[Checkins] SVN: Sandbox/gotcha/z3c.taskqueue/src/z3c/taskqueue/ startup subscriber should remain in lovely.remotetask

[Godefroid Chapelle]

Log message for revision 109805:
  startup subscriber should remain in lovely.remotetask

Changed:
  U   Sandbox/gotcha/z3c.taskqueue/src/z3c/taskqueue/configure.zcml
  U   Sandbox/gotcha/z3c.taskqueue/src/z3c/taskqueue/service.py

-=-
Modified: Sandbox/gotcha/z3c.taskqueue/src/z3c/taskqueue/configure.zcml
===================================================================
--- Sandbox/gotcha/z3c.taskqueue/src/z3c/taskqueue/configure.zcml	2010-03-08 10:30:39 UTC (rev 109804)
+++ Sandbox/gotcha/z3c.taskqueue/src/z3c/taskqueue/configure.zcml	2010-03-08 10:32:36 UTC (rev 109805)
@@ -1,6 +1,6 @@
 <configure
     xmlns="http://namespaces.zope.org/zope"
-    i18n_domain="lovely.remotetask">
+    i18n_domain="z3c.taskqueue">
 
   <class class=".service.TaskService">
     <implements
@@ -28,11 +28,6 @@
         set_schema=".interfaces.ICronJob" />
   </class>
 
-  <subscriber
-      for="zope.app.appsetup.IDatabaseOpenedEvent"
-      handler=".service.bootStrapSubscriber"
-   />
-   
   <!-- Demo: Echo Task -->
   <utility
       factory=".task.EchoTask"

Modified: Sandbox/gotcha/z3c.taskqueue/src/z3c/taskqueue/service.py
===================================================================
--- Sandbox/gotcha/z3c.taskqueue/src/z3c/taskqueue/service.py	2010-03-08 10:30:39 UTC (rev 109804)
+++ Sandbox/gotcha/z3c.taskqueue/src/z3c/taskqueue/service.py	2010-03-08 10:32:36 UTC (rev 109805)
@@ -359,68 +359,3 @@
         serviceNames = [name.strip()
                         for name in config.get('autostart', '').split(',')]
     return serviceNames
-
-
-def bootStrapSubscriber(event):
-    """Start the queue processing services based on the
-       settings in zope.conf"""
-
-    serviceNames = getAutostartServiceNames()
-
-    db = event.database
-    connection = db.open()
-    root = connection.root()
-    root_folder = root.get(ZopePublication.root_name, None)
-    # we assume that portals can only added at site root level
-
-    log.info('handling event IStartRemoteTasksEvent')
-
-    for siteName, serviceName in [name.split('@')
-                                  for name in serviceNames if name]:
-        if siteName == '':
-            sites = [root_folder]
-        elif siteName == '*':
-            sites = []
-            sites.append(root_folder)
-            for folder in root_folder.values():
-                if zope.location.interfaces.ISite.providedBy(folder):
-                    sites.append(folder)
-        else:
-            sites = [root_folder.get(siteName)]
-
-        rootSM = root_folder.getSiteManager()
-        rootServices = list(rootSM.getUtilitiesFor(interfaces.ITaskService))
-
-        for site in sites:
-            csName = getattr(site, "__name__", '')
-            if csName is None:
-                csName = 'root'
-            if site is not None:
-                sm = site.getSiteManager()
-                if serviceName == '*':
-                    services = list(sm.getUtilitiesFor(interfaces.ITaskService))
-                    if siteName != "*" and siteName != '':
-                        services = [s for s in services
-                                       if s not in rootServices]
-                else:
-                    services = [(serviceName,
-                                 component.queryUtility(interfaces.ITaskService,
-                                                       context=site,
-                                                       name=serviceName))]
-                serviceCount = 0
-                for srvname, service in services:
-                    if service is not None and not service.isProcessing():
-                        service.startProcessing()
-                        serviceCount += 1
-                        msg = 'service %s on site %s started'
-                        log.info(msg % (srvname, csName))
-                    else:
-                        if siteName != "*" and serviceName != "*":
-                            msg = 'service %s on site %s not found'
-                            log.error(msg % (srvname, csName))
-            else:
-                log.error('site %s not found' % siteName)
-
-        if (siteName == "*" or serviceName == "*") and serviceCount == 0:
-            msg = 'no services started by directive %s'
-            log.warn(msg % name)