<!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>[13811] CalendarServer/trunk</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/13811">13811</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2014-07-31 16:22:20 -0700 (Thu, 31 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Calls a service-disabling program if we can't create the store</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcalendarservertapcaldavpy">CalendarServer/trunk/calendarserver/tap/caldav.py</a></li>
<li><a href="#CalendarServertrunkcontriblaunchdcalendarserverplist">CalendarServer/trunk/contrib/launchd/calendarserver.plist</a></li>
<li><a href="#CalendarServertrunktwistedcaldavstdconfigpy">CalendarServer/trunk/twistedcaldav/stdconfig.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 (13810 => 13811)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tap/caldav.py 2014-07-31 21:05:16 UTC (rev 13810)
+++ CalendarServer/trunk/calendarserver/tap/caldav.py 2014-07-31 23:22:20 UTC (rev 13811)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx"> from os.path import exists, basename, isfile
</span><span class="cx"> import socket
</span><span class="cx"> from stat import S_ISSOCK
</span><del>-from time import time
</del><ins>+import time
</ins><span class="cx"> from subprocess import Popen, PIPE
</span><span class="cx"> from pwd import getpwuid, getpwnam
</span><span class="cx"> from grp import getgrnam
</span><span class="lines">@@ -682,6 +682,26 @@
</span><span class="cx"> 0, service.setServiceParent, self.parent
</span><span class="cx"> )
</span><span class="cx"> except StoreNotAvailable:
</span><ins>+ log.error("Data store not available; shutting down")
+
+ if config.ServiceDisablingProgram:
+ # If the store is not available, we don't want launchd to
+ # repeatedly launch us, we want our job to get unloaded.
+ # If the config.ServiceDisablingProgram is assigned and exists
+ # we execute it now. Its job is to carry out the platform-
+ # specific tasks of disabling the service.
+ if exists(config.ServiceDisablingProgram):
+ log.error(
+ "Disabling service via {exe}",
+ exe=config.ServiceDisablingProgram
+ )
+ Popen(
+ args=[config.ServiceDisablingProgram],
+ stdout=PIPE,
+ stderr=PIPE,
+ ).communicate()
+ time.sleep(60)
+
</ins><span class="cx"> self.reactor.stop()
</span><span class="cx">
</span><span class="cx"> return succeed(None)
</span><span class="lines">@@ -707,13 +727,6 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-class PostUpgradeStopRequested(Exception):
- """
- Raised when we've been asked to stop just after upgrade has completed.
- """
-
-
-
</del><span class="cx"> class StoreNotAvailable(Exception):
</span><span class="cx"> """
</span><span class="cx"> Raised when we want to give up because the store is not available
</span><span class="lines">@@ -2447,7 +2460,7 @@
</span><span class="cx"> p.service = self
</span><span class="cx"> p.name = name
</span><span class="cx"> procObj, env, uid, gid = self.processes[name]
</span><del>- self.timeStarted[name] = time()
</del><ins>+ self.timeStarted[name] = time.time()
</ins><span class="cx">
</span><span class="cx"> childFDs = {0: "w", 1: "r", 2: "r"}
</span><span class="cx">
</span><span class="lines">@@ -2504,7 +2517,7 @@
</span><span class="cx">
</span><span class="cx"> if uidgid:
</span><span class="cx"> uidgid = '(' + uidgid + ')'
</span><del>- l.append("{:r}{}: {:r}".format(name, uidgid, procObj))
</del><ins>+ l.append("{}{}: {}".format(name, uidgid, procObj))
</ins><span class="cx">
</span><span class="cx"> return (
</span><span class="cx"> "<{self.__class__.__name__} {l}>"
</span></span></pre></div>
<a id="CalendarServertrunkcontriblaunchdcalendarserverplist"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/contrib/launchd/calendarserver.plist (13810 => 13811)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/contrib/launchd/calendarserver.plist 2014-07-31 21:05:16 UTC (rev 13810)
+++ CalendarServer/trunk/contrib/launchd/calendarserver.plist 2014-07-31 23:22:20 UTC (rev 13811)
</span><span class="lines">@@ -34,6 +34,8 @@
</span><span class="cx"> <string>kqueue</string>
</span><span class="cx"> <string>-o</string>
</span><span class="cx"> <string>FailIfUpgradeNeeded=False</string>
</span><ins>+ <string>-o</string>
+ <string>ServiceDisablingProgram=/Applications/Server.app/Contents/ServerRoot/Library/CalendarServer/bin/calendarserver_stop
</ins><span class="cx"> </array>
</span><span class="cx">
</span><span class="cx"> <key>EnvironmentVariables</key>
</span><span class="lines">@@ -44,7 +46,7 @@
</span><span class="cx">
</span><span class="cx"> <key>InitGroups</key>
</span><span class="cx"> <true/>
</span><del>-
</del><ins>+
</ins><span class="cx"> <key>AbandonProcessGroup</key>
</span><span class="cx"> <true/>
</span><span class="cx">
</span><span class="lines">@@ -68,7 +70,7 @@
</span><span class="cx">
</span><span class="cx"> <key>PreventsSleep</key>
</span><span class="cx"> <true/>
</span><del>-
</del><ins>+
</ins><span class="cx"> <key>StandardOutPath</key>
</span><span class="cx"> <string>/Library/Server/Logs/caldavd.log</string>
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavstdconfigpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/stdconfig.py (13810 => 13811)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/stdconfig.py 2014-07-31 21:05:16 UTC (rev 13810)
+++ CalendarServer/trunk/twistedcaldav/stdconfig.py 2014-07-31 23:22:20 UTC (rev 13811)
</span><span class="lines">@@ -1130,6 +1130,10 @@
</span><span class="cx"> # means no automatic shutdown.
</span><span class="cx"> "AgentInactivityTimeoutSeconds" : 5 * 60,
</span><span class="cx">
</span><ins>+ # Program to execute if the service cannot start; for example in OS X we
+ # want to call serveradmin to disable the service so launchd does not keep
+ # respawning it. Empty string to disable this feature.
+ "ServiceDisablingProgram": "",
</ins><span class="cx">
</span><span class="cx"> # These three keys are relative to ConfigRoot:
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>