<!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>[14702] CalendarServer/branches/release/CalendarServer-6.1-dev</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/14702">14702</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2015-04-23 19:56:27 -0700 (Thu, 23 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Post an alert if server root is unavailable and wait</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesreleaseCalendarServer61devcalendarservertaputilpy">CalendarServer/branches/release/CalendarServer-6.1-dev/calendarserver/tap/util.py</a></li>
<li><a href="#CalendarServerbranchesreleaseCalendarServer61devcalendarservertoolsutilpy">CalendarServer/branches/release/CalendarServer-6.1-dev/calendarserver/tools/util.py</a></li>
<li><a href="#CalendarServerbranchesreleaseCalendarServer61devconfcaldavdappleplist">CalendarServer/branches/release/CalendarServer-6.1-dev/conf/caldavd-apple.plist</a></li>
<li><a href="#CalendarServerbranchesreleaseCalendarServer61devtwistedcaldavstdconfigpy">CalendarServer/branches/release/CalendarServer-6.1-dev/twistedcaldav/stdconfig.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesreleaseCalendarServer61devcalendarservertaputilpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/release/CalendarServer-6.1-dev/calendarserver/tap/util.py (14701 => 14702)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/release/CalendarServer-6.1-dev/calendarserver/tap/util.py 2015-04-23 18:58:21 UTC (rev 14701)
+++ CalendarServer/branches/release/CalendarServer-6.1-dev/calendarserver/tap/util.py 2015-04-24 02:56:27 UTC (rev 14702)
</span><span class="lines">@@ -25,6 +25,7 @@
</span><span class="cx"> "getRootResource",
</span><span class="cx"> "getSSLPassphrase",
</span><span class="cx"> "MemoryLimitService",
</span><ins>+ "postAlert",
</ins><span class="cx"> "preFlightChecks",
</span><span class="cx"> ]
</span><span class="cx">
</span><span class="lines">@@ -1445,3 +1446,23 @@
</span><span class="cx"> return output.strip()
</span><span class="cx">
</span><span class="cx"> return None
</span><ins>+
+
+def postAlert(alertType, args):
+ if (
+ config.AlertPostingProgram and
+ os.path.exists(config.AlertPostingProgram)
+ ):
+ try:
+ commandLine = [config.AlertPostingProgram, alertType]
+ commandLine.extend(args)
+ Popen(
+ commandLine,
+ stdout=PIPE,
+ stderr=PIPE,
+ ).communicate()
+ except Exception, e:
+ log.error(
+ "Could not post alert: {alertType} {args} ({error})",
+ alertType=alertType, args=args, error=e
+ )
</ins></span></pre></div>
<a id="CalendarServerbranchesreleaseCalendarServer61devcalendarservertoolsutilpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/release/CalendarServer-6.1-dev/calendarserver/tools/util.py (14701 => 14702)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/release/CalendarServer-6.1-dev/calendarserver/tools/util.py 2015-04-23 18:58:21 UTC (rev 14701)
+++ CalendarServer/branches/release/CalendarServer-6.1-dev/calendarserver/tools/util.py 2015-04-24 02:56:27 UTC (rev 14702)
</span><span class="lines">@@ -140,9 +140,16 @@
</span><span class="cx"> if not os.path.exists(dirpath):
</span><span class="cx">
</span><span class="cx"> if wait:
</span><ins>+
+ # If we're being told to wait, post an alert that we can't continue
+ # until the volume is mounted
+ if not os.path.exists(dirpath):
+ from calendarserver.tap.util import postAlert
+ postAlert("MissingDataVolumeAlert", ["volumePath", dirpath])
+
</ins><span class="cx"> while not os.path.exists(dirpath):
</span><span class="cx"> print("Path does not exist: %s" % (dirpath,))
</span><del>- sleep(1)
</del><ins>+ sleep(5)
</ins><span class="cx"> else:
</span><span class="cx"> try:
</span><span class="cx"> mode, username, groupname = create
</span></span></pre></div>
<a id="CalendarServerbranchesreleaseCalendarServer61devconfcaldavdappleplist"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/release/CalendarServer-6.1-dev/conf/caldavd-apple.plist (14701 => 14702)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/release/CalendarServer-6.1-dev/conf/caldavd-apple.plist 2015-04-23 18:58:21 UTC (rev 14701)
+++ CalendarServer/branches/release/CalendarServer-6.1-dev/conf/caldavd-apple.plist 2015-04-24 02:56:27 UTC (rev 14702)
</span><span class="lines">@@ -556,6 +556,12 @@
</span><span class="cx"> <true/>
</span><span class="cx"> </dict>
</span><span class="cx">
</span><ins>+ <!-- Alert-posting program
+ -->
+ <key>AlertPostingProgram</key>
+ <string>/Applications/Server.app/Contents/ServerRoot/Library/CalendarServer/bin/calendarserver_alert</string>
+
+
</ins><span class="cx"> <key>Includes</key>
</span><span class="cx"> <array>
</span><span class="cx"> <string>/Library/Preferences/com.apple.servermgr_calendar.plist</string>
</span></span></pre></div>
<a id="CalendarServerbranchesreleaseCalendarServer61devtwistedcaldavstdconfigpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/release/CalendarServer-6.1-dev/twistedcaldav/stdconfig.py (14701 => 14702)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/release/CalendarServer-6.1-dev/twistedcaldav/stdconfig.py 2015-04-23 18:58:21 UTC (rev 14701)
+++ CalendarServer/branches/release/CalendarServer-6.1-dev/twistedcaldav/stdconfig.py 2015-04-24 02:56:27 UTC (rev 14702)
</span><span class="lines">@@ -1064,6 +1064,10 @@
</span><span class="cx"> # respawning it. Empty string to disable this feature.
</span><span class="cx"> "ServiceDisablingProgram": "",
</span><span class="cx">
</span><ins>+ # Program to execute to post an alert to the administrator; for example in
+ # OS X we want to call calendarserver_alert <alert-type> <args>
+ "AlertPostingProgram": "",
+
</ins><span class="cx"> # These three keys are relative to ConfigRoot:
</span><span class="cx">
</span><span class="cx"> # Config to read first and merge
</span></span></pre>
</div>
</div>
</body>
</html>