<!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>[12901] CalendarServer/trunk/calendarserver/tap/caldav.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/12901">12901</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2014-03-13 15:26:56 -0700 (Thu, 13 Mar 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>Get ReExecService from twext.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcalendarservertapcaldavpy">CalendarServer/trunk/calendarserver/tap/caldav.py</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkcalendarservertapcaldavpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tap/caldav.py (12900 => 12901)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tap/caldav.py        2014-03-13 22:26:30 UTC (rev 12900)
+++ CalendarServer/trunk/calendarserver/tap/caldav.py        2014-03-13 22:26:56 UTC (rev 12901)
</span><span class="lines">@@ -23,7 +23,6 @@
</span><span class="cx"> ]
</span><span class="cx"> 
</span><span class="cx"> import os
</span><del>-import signal
</del><span class="cx"> import socket
</span><span class="cx"> import stat
</span><span class="cx"> import sys
</span><span class="lines">@@ -67,6 +66,8 @@
</span><span class="cx"> from twext.internet.tcp import MaxAcceptTCPServer, MaxAcceptSSLServer
</span><span class="cx"> from twext.python.filepath import CachingFilePath
</span><span class="cx"> from twext.python.log import Logger, LogLevel, replaceTwistedLoggers
</span><ins>+from twext.application.service import ReExecService
+
</ins><span class="cx"> from txweb2.channel.http import (
</span><span class="cx">     LimitingHTTPFactory, SSLRedirectRequest, HTTPChannel
</span><span class="cx"> )
</span><span class="lines">@@ -604,58 +605,6 @@
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> 
</span><del>-class ReExecService(MultiService):
-    &quot;&quot;&quot;
-    A MultiService which catches SIGHUP and re-exec's the process.
-    &quot;&quot;&quot;
-    log = Logger()
-
-    def __init__(self, pidfilePath, reactor=None):
-        &quot;&quot;&quot;
-        @param pidFilePath: Absolute path to the pidfile which will need to be
-            removed
-        @type pidFilePath: C{str}
-        &quot;&quot;&quot;
-        self.pidfilePath = pidfilePath
-        if reactor is None:
-            from twisted.internet import reactor
-        self.reactor = reactor
-        MultiService.__init__(self)
-
-
-    def reExec(self):
-        &quot;&quot;&quot;
-        Removes pidfile, registers an exec to happen after shutdown, then
-        stops the reactor.
-        &quot;&quot;&quot;
-        self.log.warn(&quot;SIGHUP received - restarting&quot;)
-        try:
-            self.log.info(&quot;Removing pidfile: {log_source.pidfilePath}&quot;)
-            os.remove(self.pidfilePath)
-        except OSError:
-            pass
-        self.reactor.addSystemEventTrigger(
-            &quot;after&quot;, &quot;shutdown&quot;, os.execv,
-            sys.executable, [sys.executable] + sys.argv
-        )
-        self.reactor.stop()
-
-
-    def sighupHandler(self, num, frame):
-        self.reactor.callFromThread(self.reExec)
-
-
-    def startService(self):
-        self.previousHandler = signal.signal(signal.SIGHUP, self.sighupHandler)
-        MultiService.startService(self)
-
-
-    def stopService(self):
-        signal.signal(signal.SIGHUP, self.previousHandler)
-        MultiService.stopService(self)
-
-
-
</del><span class="cx"> class PreProcessingService(Service):
</span><span class="cx">     &quot;&quot;&quot;
</span><span class="cx">     A Service responsible for running any work that needs to be finished prior
</span></span></pre>
</div>
</div>

</body>
</html>