<!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>[15642] twext/trunk/twext/python/usage.py</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/15642">15642</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2016-05-27 16:22:51 -0700 (Fri, 27 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>API cleanup</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#twexttrunktwextpythonusagepy">twext/trunk/twext/python/usage.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="twexttrunktwextpythonusagepy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/python/usage.py (15641 => 15642)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/python/usage.py 2016-05-27 22:49:34 UTC (rev 15641)
+++ twext/trunk/twext/python/usage.py 2016-05-27 23:22:51 UTC (rev 15642)
</span><span class="lines">@@ -64,10 +64,33 @@
</span><span class="cx"> options = None
</span><span class="cx">
</span><span class="cx"> instance = cls(options)
</span><ins>+ try:
+ instance.run()
+ except Exception as e:
+ exit(ExitStatus.EX_SOFTWARE, "Error: {}\n".format(e))
</ins><span class="cx">
</span><del>- pidFile = options.get("pidFile")
</del><span class="cx">
</span><del>- if options.get("kill"):
</del><ins>+ def __init__(self, options):
+ self.options = options
+
+
+ def run(self):
+ self.postOptions()
+ self.optionallyKill()
+ self.writePIDFile()
+ self.startLogging()
+ self.runReactor()
+ self.shutDown()
+
+
+ def postOptions(self):
+ pass
+
+
+ def optionallyKill(self):
+ pidFile = self.options.get("pidFile")
+
+ if self.options.get("kill"):
</ins><span class="cx"> if pidFile is None:
</span><span class="cx"> exit(ExitStatus.EX_USAGE, "--pid-file required to use --kill")
</span><span class="cx"> else:
</span><span class="lines">@@ -82,28 +105,21 @@
</span><span class="cx"> except ValueError:
</span><span class="cx"> exit(ExitStatus.EX_DATAERR, "Invalid pid file.")
</span><span class="cx">
</span><del>- instance.startLogging()
- cls.log.info("Terminating process: {pid}", pid=pid)
</del><ins>+ self.startLogging()
+ self.log.info("Terminating process: {pid}", pid=pid)
</ins><span class="cx">
</span><span class="cx"> kill(pid, signal.SIGTERM)
</span><span class="cx">
</span><span class="cx"> exit(ExitStatus.EX_OK)
</span><span class="cx">
</span><ins>+
+ def writePIDFile(self):
+ pidFile = self.options.get("pidFile")
</ins><span class="cx"> if pidFile is not None:
</span><span class="cx"> pid = getpid()
</span><span class="cx"> pidFile.setContent(u"{}\n".format(pid).encode("utf-8"))
</span><span class="cx">
</span><del>- instance.startLogging()
- from twisted.internet import reactor
- reactor.callWhenRunning(instance.whenRunning)
- instance.run()
- instance.tearDown()
</del><span class="cx">
</span><del>-
- def __init__(self, options):
- self.options = options
-
-
</del><span class="cx"> def startLogging(self):
</span><span class="cx"> logFile = self.options.get("logFile", sys.stderr)
</span><span class="cx">
</span><span class="lines">@@ -124,17 +140,18 @@
</span><span class="cx"> globalLogBeginner.beginLoggingTo([filteringObserver])
</span><span class="cx">
</span><span class="cx">
</span><del>- def whenRunning(self):
- pass
-
-
- def run(self):
</del><ins>+ def runReactor(self):
</ins><span class="cx"> from twisted.internet import reactor
</span><ins>+ reactor.callWhenRunning(self.whenRunning)
</ins><span class="cx"> self.log.info("Starting reactor...")
</span><span class="cx"> reactor.run()
</span><span class="cx">
</span><span class="cx">
</span><del>- def tearDown(self):
</del><ins>+ def whenRunning(self):
+ pass
+
+
+ def shutDown(self):
</ins><span class="cx"> pidFile = self.options.get("pidFile")
</span><span class="cx"> if pidFile is not None:
</span><span class="cx"> pidFile.remove()
</span></span></pre>
</div>
</div>
</body>
</html>