<!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>[12355] CalendarServer/trunk/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/12355">12355</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2014-01-15 14:41:04 -0800 (Wed, 15 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>have ampnotifications.py and push.py use the WorkerService from cmdline.py</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcalendarservertoolsampnotificationspy">CalendarServer/trunk/calendarserver/tools/ampnotifications.py</a></li>
<li><a href="#CalendarServertrunkcalendarservertoolspushpy">CalendarServer/trunk/calendarserver/tools/push.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkcalendarservertoolsampnotificationspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tools/ampnotifications.py (12354 => 12355)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tools/ampnotifications.py 2014-01-15 22:40:43 UTC (rev 12354)
+++ CalendarServer/trunk/calendarserver/tools/ampnotifications.py 2014-01-15 22:41:04 UTC (rev 12355)
</span><span class="lines">@@ -17,21 +17,20 @@
</span><span class="cx"> from __future__ import print_function
</span><span class="cx">
</span><span class="cx"> from calendarserver.push.amppush import subscribeToIDs
</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 getopt import getopt, GetoptError
</span><span class="cx">
</span><span class="cx"> from twext.python.log import Logger
</span><span class="cx">
</span><del>-from twisted.application.service import Service
</del><span class="cx"> from twisted.internet.defer import inlineCallbacks, succeed
</span><del>-from twistedcaldav.config import ConfigurationError
</del><span class="cx">
</span><span class="cx"> import os
</span><span class="cx"> import sys
</span><span class="cx">
</span><span class="cx"> log = Logger()
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> def usage(e=None):
</span><span class="cx">
</span><span class="cx"> name = os.path.basename(sys.argv[0])
</span><span class="lines">@@ -55,24 +54,6 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-class WorkerService(Service):
-
- def __init__(self, store):
- self.store = store
-
-
- @inlineCallbacks
- def startService(self):
- try:
- yield self.doWork()
- except ConfigurationError, ce:
- sys.stderr.write("Error: %s\n" % (str(ce),))
- except Exception, e:
- sys.stderr.write("Error: %s\n" % (e,))
- raise
-
-
-
</del><span class="cx"> class MonitorAMPNotifications(WorkerService):
</span><span class="cx">
</span><span class="cx"> ids = []
</span><span class="lines">@@ -83,7 +64,13 @@
</span><span class="cx"> return monitorAMPNotifications(self.hostname, self.port, self.ids)
</span><span class="cx">
</span><span class="cx">
</span><ins>+ def postStartService(self):
+ """
+ Don't quit right away
+ """
+ pass
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> def main():
</span><span class="cx">
</span><span class="cx"> try:
</span></span></pre></div>
<a id="CalendarServertrunkcalendarservertoolspushpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tools/push.py (12354 => 12355)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tools/push.py 2014-01-15 22:40:43 UTC (rev 12354)
+++ CalendarServer/trunk/calendarserver/tools/push.py 2014-01-15 22:41:04 UTC (rev 12355)
</span><span class="lines">@@ -16,64 +16,15 @@
</span><span class="cx"> ##
</span><span class="cx"> from __future__ import print_function
</span><span class="cx">
</span><del>-from calendarserver.tap.util import getRootResource
-from calendarserver.tools.cmdline import utilityMain
-from errno import ENOENT, EACCES
</del><ins>+from calendarserver.tools.cmdline import utilityMain, WorkerService
</ins><span class="cx"> from argparse import ArgumentParser
</span><span class="cx"> from twext.python.log import Logger
</span><del>-from twisted.application.service import Service
-from twisted.internet import reactor
</del><span class="cx"> from twisted.internet.defer import inlineCallbacks
</span><del>-from twistedcaldav.config import config, ConfigurationError
-import sys
</del><span class="cx"> import time
</span><span class="cx">
</span><span class="cx"> log = Logger()
</span><span class="cx">
</span><span class="cx">
</span><del>-class WorkerService(Service):
-
- def __init__(self, store):
- self.store = store
-
-
- def rootResource(self):
- try:
- rootResource = getRootResource(config, self.store)
- except OSError, e:
- if e.errno == ENOENT:
- # Trying to re-write resources.xml but its parent directory does
- # not exist. The server's never been started, so we're missing
- # state required to do any work. (Plus, what would be the point
- # of purging stuff from a server that's completely empty?)
- raise ConfigurationError(
- "It appears that the server has never been started.\n"
- "Please start it at least once before purging anything.")
- elif e.errno == EACCES:
- # Trying to re-write resources.xml but it is not writable by the
- # current user. This most likely means we're in a system
- # configuration and the user doesn't have sufficient privileges
- # to do the other things the tool might need to do either.
- raise ConfigurationError("You must run this tool as root.")
- else:
- raise
- return rootResource
-
-
- @inlineCallbacks
- def startService(self):
- try:
- yield self.doWork()
- except ConfigurationError, ce:
- sys.stderr.write("Error: %s\n" % (str(ce),))
- except Exception, e:
- sys.stderr.write("Error: %s\n" % (e,))
- raise
- finally:
- reactor.stop()
-
-
-
</del><span class="cx"> class DisplayAPNSubscriptions(WorkerService):
</span><span class="cx">
</span><span class="cx"> users = []
</span><span class="lines">@@ -82,7 +33,7 @@
</span><span class="cx"> rootResource = self.rootResource()
</span><span class="cx"> directory = rootResource.getDirectory()
</span><span class="cx"> return displayAPNSubscriptions(self.store, directory, rootResource,
</span><del>- self.users)
</del><ins>+ self.users)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -91,7 +42,7 @@
</span><span class="cx"> parser = ArgumentParser(description='Display Apple Push Notification subscriptions')
</span><span class="cx"> parser.add_argument('-f', '--config', dest='configFileName', metavar='CONFIGFILE', help='caldavd.plist configuration file path')
</span><span class="cx"> parser.add_argument('-d', '--debug', action='store_true', help='show debug logging')
</span><del>- parser.add_argument('user', help='one or more users to display', nargs='+') # Required
</del><ins>+ parser.add_argument('user', help='one or more users to display', nargs='+') # Required
</ins><span class="cx"> args = parser.parse_args()
</span><span class="cx">
</span><span class="cx"> DisplayAPNSubscriptions.users = args.user
</span><span class="lines">@@ -122,8 +73,8 @@
</span><span class="cx"> print
</span><span class="cx"> protocol, _ignore_host, path = key.strip("/").split("/", 2)
</span><span class="cx"> resource = {
</span><del>- "CalDAV" : "calendar",
- "CardDAV" : "addressbook",
</del><ins>+ "CalDAV": "calendar",
+ "CardDAV": "addressbook",
</ins><span class="cx"> }[protocol]
</span><span class="cx"> if "/" in path:
</span><span class="cx"> uid, collection = path.split("/")
</span></span></pre>
</div>
</div>
</body>
</html>