<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[12357] CalendarServer/branches/release/CalendarServer-5.2-dev/calendarserver/tools</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.calendarserver.org//changeset/12357">12357</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2014-01-16 07:36:02 -0800 (Thu, 16 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make sure all cli tools use a service class derived from WorkerService. Also add an assert to ensure that is the case.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesreleaseCalendarServer52devcalendarservertoolscalverifypy">CalendarServer/branches/release/CalendarServer-5.2-dev/calendarserver/tools/calverify.py</a></li>
<li><a href="#CalendarServerbranchesreleaseCalendarServer52devcalendarservertoolscmdlinepy">CalendarServer/branches/release/CalendarServer-5.2-dev/calendarserver/tools/cmdline.py</a></li>
<li><a href="#CalendarServerbranchesreleaseCalendarServer52devcalendarservertoolsdbinspectpy">CalendarServer/branches/release/CalendarServer-5.2-dev/calendarserver/tools/dbinspect.py</a></li>
<li><a href="#CalendarServerbranchesreleaseCalendarServer52devcalendarservertoolsexportpy">CalendarServer/branches/release/CalendarServer-5.2-dev/calendarserver/tools/export.py</a></li>
<li><a href="#CalendarServerbranchesreleaseCalendarServer52devcalendarservertoolsmigrate_verifypy">CalendarServer/branches/release/CalendarServer-5.2-dev/calendarserver/tools/migrate_verify.py</a></li>
<li><a href="#CalendarServerbranchesreleaseCalendarServer52devcalendarservertoolsobliteratepy">CalendarServer/branches/release/CalendarServer-5.2-dev/calendarserver/tools/obliterate.py</a></li>
<li><a href="#CalendarServerbranchesreleaseCalendarServer52devcalendarservertoolsshellterminalpy">CalendarServer/branches/release/CalendarServer-5.2-dev/calendarserver/tools/shell/terminal.py</a></li>
<li><a href="#CalendarServerbranchesreleaseCalendarServer52devcalendarservertoolstesttest_calverifypy">CalendarServer/branches/release/CalendarServer-5.2-dev/calendarserver/tools/test/test_calverify.py</a></li>
<li><a href="#CalendarServerbranchesreleaseCalendarServer52devcalendarservertoolsupgradepy">CalendarServer/branches/release/CalendarServer-5.2-dev/calendarserver/tools/upgrade.py</a></li>
<li><a href="#CalendarServerbranchesreleaseCalendarServer52devcalendarservertoolsvalidcalendardatapy">CalendarServer/branches/release/CalendarServer-5.2-dev/calendarserver/tools/validcalendardata.py</a></li>
<li><a href="#CalendarServerbranchesreleaseCalendarServer52devcalendarservertoolsworkitemspy">CalendarServer/branches/release/CalendarServer-5.2-dev/calendarserver/tools/workitems.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesreleaseCalendarServer52devcalendarservertoolscalverifypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/release/CalendarServer-5.2-dev/calendarserver/tools/calverify.py (12356 => 12357)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/release/CalendarServer-5.2-dev/calendarserver/tools/calverify.py        2014-01-16 02:21:30 UTC (rev 12356)
+++ CalendarServer/branches/release/CalendarServer-5.2-dev/calendarserver/tools/calverify.py        2014-01-16 15:36:02 UTC (rev 12357)
</span><span class="lines">@@ -54,7 +54,6 @@
</span><span class="cx"> from pycalendar.period import PyCalendarPeriod
</span><span class="cx"> from pycalendar.timezone import PyCalendarTimezone
</span><span class="cx">
</span><del>-from twisted.application.service import Service
</del><span class="cx"> from twisted.internet.defer import inlineCallbacks, returnValue
</span><span class="cx"> from twisted.python import usage
</span><span class="cx"> from twisted.python.usage import Options
</span><span class="lines">@@ -78,7 +77,7 @@
</span><span class="cx"> from txdav.common.datastore.sql_tables import schema, _BIND_MODE_OWN
</span><span class="cx"> from txdav.common.icommondatastore import InternalDataStoreError
</span><span class="cx">
</span><del>-from calendarserver.tools.cmdline import utilityMain
</del><ins>+from calendarserver.tools.cmdline import utilityMain, WorkerService
</ins><span class="cx">
</span><span class="cx"> from calendarserver.tools import tables
</span><span class="cx"> from calendarserver.tools.util import getDirectory
</span><span class="lines">@@ -386,14 +385,13 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-class CalVerifyService(Service, object):
</del><ins>+class CalVerifyService(WorkerService, object):
</ins><span class="cx"> """
</span><span class="cx"> Base class for common service behaviors.
</span><span class="cx"> """
</span><span class="cx">
</span><span class="cx"> def __init__(self, store, options, output, reactor, config):
</span><del>- super(CalVerifyService, self).__init__()
- self.store = store
</del><ins>+ super(CalVerifyService, self).__init__(store)
</ins><span class="cx"> self.options = options
</span><span class="cx"> self.output = output
</span><span class="cx"> self.reactor = reactor
</span><span class="lines">@@ -409,32 +407,12 @@
</span><span class="cx"> self.totalExceptions = None
</span><span class="cx">
</span><span class="cx">
</span><del>- def startService(self):
- """
- Start the service.
- """
- super(CalVerifyService, self).startService()
- self.doCalVerify()
-
-
- def stopService(self):
- """
- Stop the service. Nothing to do; everything should be finished by this
- time.
- """
- # TODO: stopping this service mid-export should really stop the export
- # loop, but this is not implemented because nothing will actually do it
- # except hitting ^C (which also calls reactor.stop(), so that will exit
- # anyway).
- pass
-
-
</del><span class="cx"> def title(self):
</span><span class="cx"> return ""
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><del>- def doCalVerify(self):
</del><ins>+ def doWork(self):
</ins><span class="cx"> """
</span><span class="cx"> Do the operation stopping the reactor when done.
</span><span class="cx"> """
</span><span class="lines">@@ -444,11 +422,9 @@
</span><span class="cx"> yield self.doAction()
</span><span class="cx"> self.output.close()
</span><span class="cx"> except:
</span><del>- log.failure("doCalVerify()")
</del><ins>+ log.failure("doWork()")
</ins><span class="cx">
</span><del>- self.reactor.stop()
</del><span class="cx">
</span><del>-
</del><span class="cx"> def directoryService(self):
</span><span class="cx"> """
</span><span class="cx"> Get an appropriate directory service for this L{CalVerifyService}'s
</span><span class="lines">@@ -2792,7 +2768,8 @@
</span><span class="cx"> self.output.write("\n")
</span><span class="cx"> self.output.write("Actual RECURRENCE-ID: %s.\n" % (rid,))
</span><span class="cx">
</span><del>- oldUID = yield calendarObj.split(rid=rid)
</del><ins>+ oldObj = yield calendarObj.split(rid=rid)
+ oldUID = oldObj.uid()
</ins><span class="cx">
</span><span class="cx"> self.output.write("\n")
</span><span class="cx"> self.output.write("Split Resource: %s at %s, old UID: %s.\n" % (resid, rid, oldUID,))
</span></span></pre></div>
<a id="CalendarServerbranchesreleaseCalendarServer52devcalendarservertoolscmdlinepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/release/CalendarServer-5.2-dev/calendarserver/tools/cmdline.py (12356 => 12357)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/release/CalendarServer-5.2-dev/calendarserver/tools/cmdline.py        2014-01-16 02:21:30 UTC (rev 12356)
+++ CalendarServer/branches/release/CalendarServer-5.2-dev/calendarserver/tools/cmdline.py        2014-01-16 15:36:02 UTC (rev 12357)
</span><span class="lines">@@ -68,6 +68,13 @@
</span><span class="cx"> will be imported and used.
</span><span class="cx"> """
</span><span class="cx">
</span><ins>+ # We want to validate that the actual service is always an instance of WorkerService, so wrap the
+ # service maker callback inside a function that does that check
+ def _makeValidService(store):
+ service = serviceClass(store)
+ assert isinstance(service, WorkerService)
+ return service
+
</ins><span class="cx"> # Install std i/o observer
</span><span class="cx"> if verbose:
</span><span class="cx"> observer = StandardIOObserver()
</span><span class="lines">@@ -83,7 +90,7 @@
</span><span class="cx"> checkDirectories(config)
</span><span class="cx">
</span><span class="cx"> config.ProcessType = "Utility"
</span><del>- config.UtilityServiceClass = serviceClass
</del><ins>+ config.UtilityServiceClass = _makeValidService
</ins><span class="cx">
</span><span class="cx"> autoDisableMemcached(config)
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServerbranchesreleaseCalendarServer52devcalendarservertoolsdbinspectpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/release/CalendarServer-5.2-dev/calendarserver/tools/dbinspect.py (12356 => 12357)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/release/CalendarServer-5.2-dev/calendarserver/tools/dbinspect.py        2014-01-16 02:21:30 UTC (rev 12356)
+++ CalendarServer/branches/release/CalendarServer-5.2-dev/calendarserver/tools/dbinspect.py        2014-01-16 15:36:02 UTC (rev 12357)
</span><span class="lines">@@ -23,12 +23,11 @@
</span><span class="cx"> """
</span><span class="cx">
</span><span class="cx"> from calendarserver.tools import tables
</span><del>-from calendarserver.tools.cmdline import utilityMain
</del><ins>+from calendarserver.tools.cmdline import utilityMain, WorkerService
</ins><span class="cx"> from pycalendar.datetime import PyCalendarDateTime
</span><span class="cx"> from twext.enterprise.dal.syntax import Select, Parameter, Count, Delete, \
</span><span class="cx"> Constant
</span><del>-from twisted.application.service import Service
-from twisted.internet.defer import inlineCallbacks, returnValue
</del><ins>+from twisted.internet.defer import inlineCallbacks, returnValue, succeed
</ins><span class="cx"> from twisted.python.filepath import FilePath
</span><span class="cx"> from twisted.python.text import wordWrap
</span><span class="cx"> from twisted.python.usage import Options
</span><span class="lines">@@ -851,14 +850,13 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-class DBInspectService(Service, object):
</del><ins>+class DBInspectService(WorkerService, object):
</ins><span class="cx"> """
</span><span class="cx"> Service which runs, exports the appropriate records, then stops the reactor.
</span><span class="cx"> """
</span><span class="cx">
</span><span class="cx"> def __init__(self, store, options, reactor, config):
</span><del>- super(DBInspectService, self).__init__()
- self.store = store
</del><ins>+ super(DBInspectService, self).__init__(store)
</ins><span class="cx"> self.options = options
</span><span class="cx"> self.reactor = reactor
</span><span class="cx"> self.config = config
</span><span class="lines">@@ -866,11 +864,10 @@
</span><span class="cx"> self.commandMap = {}
</span><span class="cx">
</span><span class="cx">
</span><del>- def startService(self):
</del><ins>+ def doWork(self):
</ins><span class="cx"> """
</span><span class="cx"> Start the service.
</span><span class="cx"> """
</span><del>- super(DBInspectService, self).startService()
</del><span class="cx">
</span><span class="cx"> # Register commands
</span><span class="cx"> self.registerCommand(TableSizes)
</span><span class="lines">@@ -890,7 +887,16 @@
</span><span class="cx"> self.registerCommand(EventsInTimerange)
</span><span class="cx"> self.doDBInspect()
</span><span class="cx">
</span><ins>+ return succeed(None)
</ins><span class="cx">
</span><ins>+
+ def postStartService(self):
+ """
+ Don't quit right away
+ """
+ pass
+
+
</ins><span class="cx"> def registerCommand(self, cmd):
</span><span class="cx"> self.commands.append(cmd.name())
</span><span class="cx"> self.commandMap[cmd.name()] = cmd
</span></span></pre></div>
<a id="CalendarServerbranchesreleaseCalendarServer52devcalendarservertoolsexportpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/release/CalendarServer-5.2-dev/calendarserver/tools/export.py (12356 => 12357)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/release/CalendarServer-5.2-dev/calendarserver/tools/export.py        2014-01-16 02:21:30 UTC (rev 12356)
+++ CalendarServer/branches/release/CalendarServer-5.2-dev/calendarserver/tools/export.py        2014-01-16 15:36:02 UTC (rev 12357)
</span><span class="lines">@@ -42,13 +42,12 @@
</span><span class="cx"> from twisted.python.text import wordWrap
</span><span class="cx"> from twisted.python.usage import Options, UsageError
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks, returnValue
</span><del>-from twisted.application.service import Service
</del><span class="cx">
</span><span class="cx"> from twext.python.log import Logger
</span><span class="cx"> from twistedcaldav.ical import Component
</span><span class="cx">
</span><span class="cx"> from twistedcaldav.stdconfig import DEFAULT_CONFIG_FILE
</span><del>-from calendarserver.tools.cmdline import utilityMain
</del><ins>+from calendarserver.tools.cmdline import utilityMain, WorkerService
</ins><span class="cx">
</span><span class="cx"> log = Logger()
</span><span class="cx">
</span><span class="lines">@@ -285,14 +284,13 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-class ExporterService(Service, object):
</del><ins>+class ExporterService(WorkerService, object):
</ins><span class="cx"> """
</span><span class="cx"> Service which runs, exports the appropriate records, then stops the reactor.
</span><span class="cx"> """
</span><span class="cx">
</span><span class="cx"> def __init__(self, store, options, output, reactor, config):
</span><del>- super(ExporterService, self).__init__()
- self.store = store
</del><ins>+ super(ExporterService, self).__init__(store)
</ins><span class="cx"> self.options = options
</span><span class="cx"> self.output = output
</span><span class="cx"> self.reactor = reactor
</span><span class="lines">@@ -300,16 +298,15 @@
</span><span class="cx"> self._directory = self.store.directoryService()
</span><span class="cx">
</span><span class="cx">
</span><del>- def startService(self):
</del><ins>+ def postStartService(self):
</ins><span class="cx"> """
</span><del>- Start the service.
</del><ins>+ Don't quit right away
</ins><span class="cx"> """
</span><del>- super(ExporterService, self).startService()
- self.doExport()
</del><ins>+ pass
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><del>- def doExport(self):
</del><ins>+ def doWork(self):
</ins><span class="cx"> """
</span><span class="cx"> Do the export, stopping the reactor when done.
</span><span class="cx"> """
</span><span class="lines">@@ -326,7 +323,7 @@
</span><span class="cx"> # update stuff needed to happen, don't want to undo it.
</span><span class="cx"> self.output.close()
</span><span class="cx"> except:
</span><del>- log.failure("doExport()")
</del><ins>+ log.failure("doWork()")
</ins><span class="cx">
</span><span class="cx"> self.reactor.stop()
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServerbranchesreleaseCalendarServer52devcalendarservertoolsmigrate_verifypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/release/CalendarServer-5.2-dev/calendarserver/tools/migrate_verify.py (12356 => 12357)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/release/CalendarServer-5.2-dev/calendarserver/tools/migrate_verify.py        2014-01-16 02:21:30 UTC (rev 12356)
+++ CalendarServer/branches/release/CalendarServer-5.2-dev/calendarserver/tools/migrate_verify.py        2014-01-16 15:36:02 UTC (rev 12357)
</span><span class="lines">@@ -29,7 +29,6 @@
</span><span class="cx"> import os
</span><span class="cx"> import sys
</span><span class="cx">
</span><del>-from twisted.application.service import Service
</del><span class="cx"> from twisted.internet.defer import inlineCallbacks, returnValue
</span><span class="cx"> from twisted.python.text import wordWrap
</span><span class="cx"> from twisted.python.usage import Options
</span><span class="lines">@@ -37,7 +36,7 @@
</span><span class="cx"> from twext.python.log import Logger
</span><span class="cx"> from twistedcaldav.stdconfig import DEFAULT_CONFIG_FILE
</span><span class="cx">
</span><del>-from calendarserver.tools.cmdline import utilityMain
</del><ins>+from calendarserver.tools.cmdline import utilityMain, WorkerService
</ins><span class="cx">
</span><span class="cx"> log = Logger()
</span><span class="cx">
</span><span class="lines">@@ -118,14 +117,13 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-class MigrateVerifyService(Service, object):
</del><ins>+class MigrateVerifyService(WorkerService, object):
</ins><span class="cx"> """
</span><span class="cx"> Service which runs, does its stuff, then stops the reactor.
</span><span class="cx"> """
</span><span class="cx">
</span><span class="cx"> def __init__(self, store, options, output, reactor, config):
</span><del>- super(MigrateVerifyService, self).__init__()
- self.store = store
</del><ins>+ super(MigrateVerifyService, self).__init__(store)
</ins><span class="cx"> self.options = options
</span><span class="cx"> self.output = output
</span><span class="cx"> self.reactor = reactor
</span><span class="lines">@@ -141,16 +139,15 @@
</span><span class="cx"> self.missingResources = []
</span><span class="cx">
</span><span class="cx">
</span><del>- def startService(self):
</del><ins>+ def postStartService(self):
</ins><span class="cx"> """
</span><del>- Start the service.
</del><ins>+ Don't quit right away
</ins><span class="cx"> """
</span><del>- super(MigrateVerifyService, self).startService()
- self.doMigrateVerify()
</del><ins>+ pass
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><del>- def doMigrateVerify(self):
</del><ins>+ def doWork(self):
</ins><span class="cx"> """
</span><span class="cx"> Do the work, stopping the reactor when done.
</span><span class="cx"> """
</span><span class="lines">@@ -163,7 +160,7 @@
</span><span class="cx"> except ConfigError:
</span><span class="cx"> pass
</span><span class="cx"> except:
</span><del>- log.failure("doMigrateVerify()")
</del><ins>+ log.failure("doWork()")
</ins><span class="cx">
</span><span class="cx"> self.reactor.stop()
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServerbranchesreleaseCalendarServer52devcalendarservertoolsobliteratepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/release/CalendarServer-5.2-dev/calendarserver/tools/obliterate.py (12356 => 12357)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/release/CalendarServer-5.2-dev/calendarserver/tools/obliterate.py        2014-01-16 02:21:30 UTC (rev 12356)
+++ CalendarServer/branches/release/CalendarServer-5.2-dev/calendarserver/tools/obliterate.py        2014-01-16 15:36:02 UTC (rev 12357)
</span><span class="lines">@@ -30,7 +30,6 @@
</span><span class="cx"> import sys
</span><span class="cx"> import time
</span><span class="cx">
</span><del>-from twisted.application.service import Service
</del><span class="cx"> from twisted.internet.defer import inlineCallbacks, returnValue
</span><span class="cx"> from twisted.python.text import wordWrap
</span><span class="cx"> from twisted.python.usage import Options
</span><span class="lines">@@ -42,7 +41,7 @@
</span><span class="cx"> from twistedcaldav.stdconfig import DEFAULT_CONFIG_FILE
</span><span class="cx"> from txdav.common.datastore.sql_tables import schema, _BIND_MODE_OWN
</span><span class="cx">
</span><del>-from calendarserver.tools.cmdline import utilityMain
</del><ins>+from calendarserver.tools.cmdline import utilityMain, WorkerService
</ins><span class="cx">
</span><span class="cx"> log = Logger()
</span><span class="cx">
</span><span class="lines">@@ -138,14 +137,13 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-class ObliterateService(Service, object):
</del><ins>+class ObliterateService(WorkerService, object):
</ins><span class="cx"> """
</span><span class="cx"> Service which runs, does its stuff, then stops the reactor.
</span><span class="cx"> """
</span><span class="cx">
</span><span class="cx"> def __init__(self, store, options, output, reactor, config):
</span><del>- super(ObliterateService, self).__init__()
- self.store = store
</del><ins>+ super(ObliterateService, self).__init__(store)
</ins><span class="cx"> self.options = options
</span><span class="cx"> self.output = output
</span><span class="cx"> self.reactor = reactor
</span><span class="lines">@@ -159,16 +157,15 @@
</span><span class="cx"> self.attachments = set()
</span><span class="cx">
</span><span class="cx">
</span><del>- def startService(self):
</del><ins>+ def postStartService(self):
</ins><span class="cx"> """
</span><del>- Start the service.
</del><ins>+ Don't quit right away
</ins><span class="cx"> """
</span><del>- super(ObliterateService, self).startService()
- self.doObliterate()
</del><ins>+ pass
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><del>- def doObliterate(self):
</del><ins>+ def doWork(self):
</ins><span class="cx"> """
</span><span class="cx"> Do the work, stopping the reactor when done.
</span><span class="cx"> """
</span><span class="lines">@@ -186,7 +183,7 @@
</span><span class="cx"> except ConfigError:
</span><span class="cx"> pass
</span><span class="cx"> except:
</span><del>- log.failure("doObliterate()")
</del><ins>+ log.failure("doWork()")
</ins><span class="cx">
</span><span class="cx"> self.reactor.stop()
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServerbranchesreleaseCalendarServer52devcalendarservertoolsshellterminalpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/release/CalendarServer-5.2-dev/calendarserver/tools/shell/terminal.py (12356 => 12357)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/release/CalendarServer-5.2-dev/calendarserver/tools/shell/terminal.py        2014-01-16 02:21:30 UTC (rev 12356)
+++ CalendarServer/branches/release/CalendarServer-5.2-dev/calendarserver/tools/shell/terminal.py        2014-01-16 15:36:02 UTC (rev 12357)
</span><span class="lines">@@ -38,12 +38,11 @@
</span><span class="cx"> from twisted.python.failure import Failure
</span><span class="cx"> from twisted.python.text import wordWrap
</span><span class="cx"> from twisted.python.usage import Options, UsageError
</span><del>-from twisted.internet.defer import Deferred
</del><ins>+from twisted.internet.defer import Deferred, succeed
</ins><span class="cx"> from twisted.internet.defer import inlineCallbacks
</span><span class="cx"> from twisted.internet.stdio import StandardIO
</span><span class="cx"> from twisted.conch.recvline import HistoricRecvLine as ReceiveLineProtocol
</span><span class="cx"> from twisted.conch.insults.insults import ServerProtocol
</span><del>-from twisted.application.service import Service
</del><span class="cx">
</span><span class="cx"> from twext.python.log import Logger
</span><span class="cx">
</span><span class="lines">@@ -51,7 +50,7 @@
</span><span class="cx">
</span><span class="cx"> from twistedcaldav.stdconfig import DEFAULT_CONFIG_FILE
</span><span class="cx">
</span><del>-from calendarserver.tools.cmdline import utilityMain
</del><ins>+from calendarserver.tools.cmdline import utilityMain, WorkerService
</ins><span class="cx"> from calendarserver.tools.util import getDirectory
</span><span class="cx"> from calendarserver.tools.shell.cmd import Commands, UsageError as CommandUsageError
</span><span class="cx">
</span><span class="lines">@@ -95,7 +94,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-class ShellService(Service, object):
</del><ins>+class ShellService(WorkerService, object):
</ins><span class="cx"> """
</span><span class="cx"> A L{ShellService} collects all the information that a shell needs to run;
</span><span class="cx"> when run, it invokes the shell on stdin/stdout.
</span><span class="lines">@@ -117,21 +116,19 @@
</span><span class="cx"> """
</span><span class="cx">
</span><span class="cx"> def __init__(self, store, directory, options, reactor, config):
</span><del>- super(ShellService, self).__init__()
- self.store = store
- self.directory = directory
- self.options = options
- self.reactor = reactor
- self.config = config
</del><ins>+ super(ShellService, self).__init__(store)
+ self.directory = directory
+ self.options = options
+ self.reactor = reactor
+ self.config = config
</ins><span class="cx"> self.terminalFD = None
</span><del>- self.protocol = None
</del><ins>+ self.protocol = None
</ins><span class="cx">
</span><span class="cx">
</span><del>- def startService(self):
</del><ins>+ def doWork(self):
</ins><span class="cx"> """
</span><del>- Start the service.
</del><ins>+ Service startup.
</ins><span class="cx"> """
</span><del>- super(ShellService, self).startService()
</del><span class="cx">
</span><span class="cx"> # Set up the terminal for interactive action
</span><span class="cx"> self.terminalFD = sys.__stdin__.fileno()
</span><span class="lines">@@ -140,8 +137,16 @@
</span><span class="cx">
</span><span class="cx"> self.protocol = ServerProtocol(lambda: ShellProtocol(self))
</span><span class="cx"> StandardIO(self.protocol)
</span><ins>+ return succeed(None)
</ins><span class="cx">
</span><span class="cx">
</span><ins>+ def postStartService(self):
+ """
+ Don't quit right away
+ """
+ pass
+
+
</ins><span class="cx"> def stopService(self):
</span><span class="cx"> """
</span><span class="cx"> Stop the service.
</span><span class="lines">@@ -280,7 +285,7 @@
</span><span class="cx"> word = ""
</span><span class="cx"> else:
</span><span class="cx"> word = tokens[-1]
</span><del>- cmd = tokens.pop(0)
</del><ins>+ cmd = tokens.pop(0)
</ins><span class="cx"> else:
</span><span class="cx"> word = cmd = ""
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServerbranchesreleaseCalendarServer52devcalendarservertoolstesttest_calverifypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/release/CalendarServer-5.2-dev/calendarserver/tools/test/test_calverify.py (12356 => 12357)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/release/CalendarServer-5.2-dev/calendarserver/tools/test/test_calverify.py        2014-01-16 02:21:30 UTC (rev 12356)
+++ CalendarServer/branches/release/CalendarServer-5.2-dev/calendarserver/tools/test/test_calverify.py        2014-01-16 15:36:02 UTC (rev 12357)
</span><span class="lines">@@ -3066,8 +3066,7 @@
</span><span class="cx"> }
</span><span class="cx"> output = StringIO()
</span><span class="cx"> calverify = EventSplitService(self._sqlCalendarStore, options, output, reactor, config)
</span><del>- oldObj = yield calverify.doAction()
- oldUID = oldObj.uid()
</del><ins>+ oldUID = yield calverify.doAction()
</ins><span class="cx">
</span><span class="cx"> relsubs = dict(self.subs)
</span><span class="cx"> relsubs["relID"] = oldUID
</span></span></pre></div>
<a id="CalendarServerbranchesreleaseCalendarServer52devcalendarservertoolsupgradepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/release/CalendarServer-5.2-dev/calendarserver/tools/upgrade.py (12356 => 12357)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/release/CalendarServer-5.2-dev/calendarserver/tools/upgrade.py        2014-01-16 02:21:30 UTC (rev 12356)
+++ CalendarServer/branches/release/CalendarServer-5.2-dev/calendarserver/tools/upgrade.py        2014-01-16 15:36:02 UTC (rev 12357)
</span><span class="lines">@@ -15,6 +15,7 @@
</span><span class="cx"> # See the License for the specific language governing permissions and
</span><span class="cx"> # limitations under the License.
</span><span class="cx"> ##
</span><ins>+from twisted.internet.defer import succeed
</ins><span class="cx">
</span><span class="cx"> """
</span><span class="cx"> This tool allows any necessary upgrade to complete, then exits.
</span><span class="lines">@@ -31,9 +32,8 @@
</span><span class="cx"> from twext.python.log import Logger, LogLevel, formatEvent, addObserver
</span><span class="cx">
</span><span class="cx"> from twistedcaldav.stdconfig import DEFAULT_CONFIG_FILE
</span><del>-from twisted.application.service import Service
</del><span class="cx">
</span><del>-from calendarserver.tools.cmdline import utilityMain
</del><ins>+from calendarserver.tools.cmdline import utilityMain, WorkerService
</ins><span class="cx"> from calendarserver.tap.caldav import CalDAVServiceMaker
</span><span class="cx">
</span><span class="cx"> log = Logger()
</span><span class="lines">@@ -122,7 +122,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-class UpgraderService(Service, object):
</del><ins>+class UpgraderService(WorkerService, object):
</ins><span class="cx"> """
</span><span class="cx"> Service which runs, exports the appropriate records, then stops the reactor.
</span><span class="cx"> """
</span><span class="lines">@@ -130,8 +130,7 @@
</span><span class="cx"> started = False
</span><span class="cx">
</span><span class="cx"> def __init__(self, store, options, output, reactor, config):
</span><del>- super(UpgraderService, self).__init__()
- self.store = store
</del><ins>+ super(UpgraderService, self).__init__(store)
</ins><span class="cx"> self.options = options
</span><span class="cx"> self.output = output
</span><span class="cx"> self.reactor = reactor
</span><span class="lines">@@ -139,7 +138,7 @@
</span><span class="cx"> self._directory = None
</span><span class="cx">
</span><span class="cx">
</span><del>- def startService(self):
</del><ins>+ def doWork(self):
</ins><span class="cx"> """
</span><span class="cx"> Immediately stop. The upgrade will have been run before this.
</span><span class="cx"> """
</span><span class="lines">@@ -155,7 +154,13 @@
</span><span class="cx"> else:
</span><span class="cx"> self.output.write("Upgrade complete, shutting down.\n")
</span><span class="cx"> UpgraderService.started = True
</span><ins>+ return succeed(None)
</ins><span class="cx">
</span><ins>+
+ def postStartService(self):
+ """
+ Quit right away
+ """
</ins><span class="cx"> from twisted.internet import reactor
</span><span class="cx"> from twisted.internet.error import ReactorNotRunning
</span><span class="cx"> try:
</span></span></pre></div>
<a id="CalendarServerbranchesreleaseCalendarServer52devcalendarservertoolsvalidcalendardatapy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/release/CalendarServer-5.2-dev/calendarserver/tools/validcalendardata.py (12356 => 12357)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/release/CalendarServer-5.2-dev/calendarserver/tools/validcalendardata.py        2014-01-16 02:21:30 UTC (rev 12356)
+++ CalendarServer/branches/release/CalendarServer-5.2-dev/calendarserver/tools/validcalendardata.py        2014-01-16 15:36:02 UTC (rev 12357)
</span><span class="lines">@@ -15,14 +15,14 @@
</span><span class="cx"> # limitations under the License.
</span><span class="cx"> ##
</span><span class="cx"> from __future__ import print_function
</span><ins>+from twisted.internet.defer import succeed
</ins><span class="cx">
</span><span class="cx"> """
</span><span class="cx"> This tool takes data from stdin and validates it as iCalendar data suitable
</span><span class="cx"> for the server.
</span><span class="cx"> """
</span><span class="cx">
</span><del>-from calendarserver.tools.cmdline import utilityMain
-from twisted.application.service import Service
</del><ins>+from calendarserver.tools.cmdline import utilityMain, WorkerService
</ins><span class="cx"> from twisted.python.text import wordWrap
</span><span class="cx"> from twisted.python.usage import Options
</span><span class="cx"> from twistedcaldav.config import config
</span><span class="lines">@@ -119,14 +119,13 @@
</span><span class="cx">
</span><span class="cx"> errorPrefix = "Calendar data had unfixable problems:\n "
</span><span class="cx">
</span><del>-class ValidService(Service, object):
</del><ins>+class ValidService(WorkerService, object):
</ins><span class="cx"> """
</span><span class="cx"> Service which runs, exports the appropriate records, then stops the reactor.
</span><span class="cx"> """
</span><span class="cx">
</span><span class="cx"> def __init__(self, store, options, output, input, reactor, config):
</span><del>- super(ValidService, self).__init__()
- self.store = store
</del><ins>+ super(ValidService, self).__init__(store)
</ins><span class="cx"> self.options = options
</span><span class="cx"> self.output = output
</span><span class="cx"> self.input = input
</span><span class="lines">@@ -135,7 +134,7 @@
</span><span class="cx"> self._directory = None
</span><span class="cx">
</span><span class="cx">
</span><del>- def startService(self):
</del><ins>+ def doWork(self):
</ins><span class="cx"> """
</span><span class="cx"> Start the service.
</span><span class="cx"> """
</span><span class="lines">@@ -149,7 +148,7 @@
</span><span class="cx"> print("Calendar data OK")
</span><span class="cx"> else:
</span><span class="cx"> print(message)
</span><del>- self.reactor.stop()
</del><ins>+ return succeed(None)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def parseCalendarData(self):
</span></span></pre></div>
<a id="CalendarServerbranchesreleaseCalendarServer52devcalendarservertoolsworkitemspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/release/CalendarServer-5.2-dev/calendarserver/tools/workitems.py (12356 => 12357)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/release/CalendarServer-5.2-dev/calendarserver/tools/workitems.py        2014-01-16 02:21:30 UTC (rev 12356)
+++ CalendarServer/branches/release/CalendarServer-5.2-dev/calendarserver/tools/workitems.py        2014-01-16 15:36:02 UTC (rev 12357)
</span><span class="lines">@@ -23,9 +23,8 @@
</span><span class="cx"> import curses
</span><span class="cx"> import datetime
</span><span class="cx">
</span><del>-from twisted.internet.defer import inlineCallbacks
-from calendarserver.tools.cmdline import utilityMain
-from twisted.application.service import Service
</del><ins>+from twisted.internet.defer import inlineCallbacks, succeed
+from calendarserver.tools.cmdline import utilityMain, WorkerService
</ins><span class="cx"> from calendarserver.push.notifier import PushNotificationWork
</span><span class="cx"> from twistedcaldav.directory.directory import GroupCacherPollingWork
</span><span class="cx"> from txdav.caldav.datastore.scheduling.imip.inbound import IMIPPollingWork, IMIPReplyWork
</span><span class="lines">@@ -86,21 +85,29 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-class WorkItemMonitorService(Service):
</del><ins>+class WorkItemMonitorService(WorkerService, object):
</ins><span class="cx">
</span><span class="cx"> def __init__(self, store):
</span><del>- self.store = store
</del><ins>+ super(WorkItemMonitorService, self).__init__(store)
</ins><span class="cx"> from twisted.internet import reactor
</span><span class="cx"> self.reactor = reactor
</span><span class="cx">
</span><span class="cx">
</span><del>- def startService(self):
</del><ins>+ def doWork(self):
</ins><span class="cx"> self.screen = curses.initscr()
</span><span class="cx"> self.windows = []
</span><span class="cx"> self.updateScreenGeometry()
</span><span class="cx"> self.reactor.callLater(0, self.updateDisplay)
</span><ins>+ return succeed(None)
</ins><span class="cx">
</span><span class="cx">
</span><ins>+ def postStartService(self):
+ """
+ Don't quit right away
+ """
+ pass
+
+
</ins><span class="cx"> def updateScreenGeometry(self):
</span><span class="cx"> for win in self.windows:
</span><span class="cx"> del win
</span></span></pre>
</div>
</div>
</body>
</html>