<!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>[15483] CalendarServer/trunk/calendarserver/tap</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/15483">15483</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2016-03-22 17:29:51 -0700 (Tue, 22 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Wait for server root to become available prior to finishing reading config.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcalendarservertapcaldavpy">CalendarServer/trunk/calendarserver/tap/caldav.py</a></li>
<li><a href="#CalendarServertrunkcalendarservertaputilpy">CalendarServer/trunk/calendarserver/tap/util.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 (15482 => 15483)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tap/caldav.py 2016-03-22 22:31:11 UTC (rev 15482)
+++ CalendarServer/trunk/calendarserver/tap/caldav.py 2016-03-23 00:29:51 UTC (rev 15483)
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx">
</span><span class="cx"> import sys
</span><span class="cx"> from collections import OrderedDict
</span><del>-from os import getuid, getgid, umask, remove, environ, stat, chown, W_OK
</del><ins>+from os import getuid, getgid, geteuid, umask, remove, environ, stat, chown, W_OK
</ins><span class="cx"> from os.path import exists, basename
</span><span class="cx"> import socket
</span><span class="cx"> from stat import S_ISSOCK
</span><span class="lines">@@ -74,6 +74,7 @@
</span><span class="cx"> from twext.application.service import ReExecService
</span><span class="cx"> from txdav.who.groups import GroupCacherPollingWork
</span><span class="cx"> from calendarserver.tools.purge import PrincipalPurgePollingWork
</span><ins>+from calendarserver.tools.util import checkDirectory
</ins><span class="cx">
</span><span class="cx"> from txweb2.channel.http import (
</span><span class="cx"> LimitingHTTPFactory, SSLRedirectRequest, HTTPChannel
</span><span class="lines">@@ -119,6 +120,7 @@
</span><span class="cx"> pgServiceFromConfig, getDBPool, MemoryLimitService,
</span><span class="cx"> storeFromConfig, getSSLPassphrase, preFlightChecks,
</span><span class="cx"> storeFromConfigWithDPSClient, storeFromConfigWithoutDPS,
</span><ins>+ serverRootLocation
</ins><span class="cx"> )
</span><span class="cx"> try:
</span><span class="cx"> from calendarserver.version import version
</span><span class="lines">@@ -405,6 +407,8 @@
</span><span class="cx">
</span><span class="cx"> def postOptions(self):
</span><span class="cx"> try:
</span><ins>+ if geteuid() == 0:
+ self.waitForServerRoot()
</ins><span class="cx"> self.loadConfiguration()
</span><span class="cx"> self.checkConfiguration()
</span><span class="cx"> except ConfigurationError, e:
</span><span class="lines">@@ -412,6 +416,20 @@
</span><span class="cx"> sys.exit(1)
</span><span class="cx">
</span><span class="cx">
</span><ins>+ def waitForServerRoot(self):
+ """
+ Block until server root directory is available
+ """
+ serverRootPath = serverRootLocation()
+ if serverRootPath:
+ checkDirectory(
+ serverRootPath,
+ "Server root",
+ access=W_OK,
+ wait=True # Wait in a loop until ServerRoot exists
+ )
+
+
</ins><span class="cx"> def loadConfiguration(self):
</span><span class="cx"> if not exists(self["config"]):
</span><span class="cx"> raise ConfigurationError(
</span></span></pre></div>
<a id="CalendarServertrunkcalendarservertaputilpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tap/util.py (15482 => 15483)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tap/util.py 2016-03-22 22:31:11 UTC (rev 15482)
+++ CalendarServer/trunk/calendarserver/tap/util.py 2016-03-23 00:29:51 UTC (rev 15483)
</span><span class="lines">@@ -103,6 +103,7 @@
</span><span class="cx"> from txweb2.resource import Resource
</span><span class="cx"> from txweb2.static import File as FileResource
</span><span class="cx">
</span><ins>+from plistlib import readPlist
</ins><span class="cx"> from urllib import quote
</span><span class="cx"> import OpenSSL
</span><span class="cx"> import errno
</span><span class="lines">@@ -111,6 +112,7 @@
</span><span class="cx"> import sys
</span><span class="cx"> import time
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> try:
</span><span class="cx"> from twistedcaldav.authkerb import NegotiateCredentialFactory
</span><span class="cx"> NegotiateCredentialFactory # pacify pyflakes
</span><span class="lines">@@ -1554,3 +1556,19 @@
</span><span class="cx"> "Could not post alert: {alertType} {args} ({error})",
</span><span class="cx"> alertType=alertType, args=args, error=e
</span><span class="cx"> )
</span><ins>+
+
+def serverRootLocation():
+ """
+ Return the ServerRoot value from the OS X preferences plist. If plist not
+ present, return empty string.
+
+ @rtype: C{unicode}
+ """
+ defaultPlistPath = "/Library/Server/Preferences/Calendar.plist"
+ serverRoot = u""
+ if os.path.exists(defaultPlistPath):
+ serverRoot = readPlist(defaultPlistPath).get("ServerRoot", serverRoot)
+ if isinstance(serverRoot, str):
+ serverRoot = serverRoot.decode("utf-8")
+ return serverRoot
</ins></span></pre>
</div>
</div>
</body>
</html>