[Checkins] SVN: Sandbox/gotcha/z3c.taskqueue/trunk/src/z3c/taskqueue/startup.py simplify start service code; get rid of start * services
Godefroid Chapelle
cvs-admin at zope.org
Mon Nov 12 15:20:43 UTC 2012
Log message for revision 128244:
simplify start service code; get rid of start * services
Changed:
U Sandbox/gotcha/z3c.taskqueue/trunk/src/z3c/taskqueue/startup.py
-=-
Modified: Sandbox/gotcha/z3c.taskqueue/trunk/src/z3c/taskqueue/startup.py
===================================================================
--- Sandbox/gotcha/z3c.taskqueue/trunk/src/z3c/taskqueue/startup.py 2012-11-12 15:11:19 UTC (rev 128243)
+++ Sandbox/gotcha/z3c.taskqueue/trunk/src/z3c/taskqueue/startup.py 2012-11-12 15:20:43 UTC (rev 128244)
@@ -40,20 +40,11 @@
startSpecifications = getStartSpecifications(configuration)
for sitesIdentifier, servicesIdentifier in startSpecifications:
- startedAnything = False
sites = getSites(sitesIdentifier, root_folder)
for site in sites:
- if servicesIdentifier == '*':
- started = startAllServices(site, root_folder)
- else:
- started = startOneService(site, servicesIdentifier)
- startedAnything = startedAnything or started
+ startOneService(site, servicesIdentifier)
- if sitesIdentifier == "*" and not startedAnything:
- msg = 'no services started by directive *@%s'
- log.warn(msg % servicesIdentifier)
-
def getRootFolder(event):
db = event.database
connection = db.open()
@@ -107,23 +98,6 @@
return site
-def startAllServices(site, root_folder):
- startedAnything = False
- services = getAllServices(site, root_folder)
- for service in services:
- started = startService(service)
- if started:
- siteName = getSiteName(site)
- msg = 'service %s on site %s started'
- log.info(msg % (service.__name__, siteName))
- startedAnything = startedAnything or started
- if not startedAnything:
- msg = 'no services started for site %s'
- siteName = getSiteName(site)
- log.warn(msg % siteName)
- return startedAnything
-
-
def getAllServices(site, root_folder):
sm = site.getSiteManager()
services = list(
@@ -139,14 +113,6 @@
return services
-def startService(service):
- if not service.isProcessing():
- service.startProcessing()
- return service.isProcessing()
- else:
- return False
-
-
def getSiteName(site):
siteName = getattr(site, '__name__', '')
if siteName is None:
@@ -157,14 +123,15 @@
def startOneService(site, serviceName):
service = getService(site, serviceName)
if service is not None:
- started = startService(service)
- if started:
- siteName = getSiteName(site)
- msg = 'service %s on site %s started'
- log.info(msg % (serviceName, siteName))
- return started
+ if not service.isProcessing():
+ service.startProcessing()
+ if service.isProcessing():
+ siteName = getSiteName(site)
+ msg = 'service %s on site %s started'
+ log.info(msg % (serviceName, siteName))
+ return service
else:
- return False
+ return None
def getService(site, serviceName):
More information about the checkins
mailing list