<!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>[15466] 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/15466">15466</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2016-03-01 11:59:08 -0800 (Tue, 01 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use sys.stdout for cli tool -D logging. Make sure utility log file is always locked to the LogRoot.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcalendarservertoolscmdlinepy">CalendarServer/trunk/calendarserver/tools/cmdline.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavstdconfigpy">CalendarServer/trunk/twistedcaldav/stdconfig.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavtesttest_stdconfigpy">CalendarServer/trunk/twistedcaldav/test/test_stdconfig.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkcalendarservertoolscmdlinepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tools/cmdline.py (15465 => 15466)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tools/cmdline.py 2016-03-01 19:40:29 UTC (rev 15465)
+++ CalendarServer/trunk/calendarserver/tools/cmdline.py 2016-03-01 19:59:08 UTC (rev 15466)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx">
</span><span class="cx"> from twisted.application.service import Service
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks, succeed
</span><del>-from twisted.logger import STDLibLogObserver, FileLogObserver, formatEventAsClassicLogText
</del><ins>+from twisted.logger import FileLogObserver, formatEventAsClassicLogText
</ins><span class="cx"> from twisted.python.logfile import LogFile
</span><span class="cx">
</span><span class="cx"> import sys
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx"> # Install std i/o observer
</span><span class="cx"> observers = []
</span><span class="cx"> if verbose:
</span><del>- observers.append(STDLibLogObserver())
</del><ins>+ observers.append(FileLogObserver(sys.stdout, lambda event: formatEventAsClassicLogText(event)))
</ins><span class="cx">
</span><span class="cx"> if reactor is None:
</span><span class="cx"> from twisted.internet import reactor
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavstdconfigpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/stdconfig.py (15465 => 15466)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/stdconfig.py 2016-03-01 19:40:29 UTC (rev 15465)
+++ CalendarServer/trunk/twistedcaldav/stdconfig.py 2016-03-01 19:59:08 UTC (rev 15466)
</span><span class="lines">@@ -1620,7 +1620,8 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> def _updateUtilityLog(configDict, reloading=False):
</span><del>- configDict["UtilityLogFile"] = "{}.log".format(basename(sys.argv[0]))
</del><ins>+ # Change just the file name to match the process - leave directory as-is
+ configDict["UtilityLogFile"] = os.path.join(os.path.dirname(configDict["UtilityLogFile"]), "{}.log".format(basename(sys.argv[0])))
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavtesttest_stdconfigpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/test/test_stdconfig.py (15465 => 15466)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/test/test_stdconfig.py 2016-03-01 19:40:29 UTC (rev 15465)
+++ CalendarServer/trunk/twistedcaldav/test/test_stdconfig.py 2016-03-01 19:59:08 UTC (rev 15466)
</span><span class="lines">@@ -22,8 +22,10 @@
</span><span class="cx">
</span><span class="cx"> from twistedcaldav.config import Config, ConfigDict
</span><span class="cx"> from twistedcaldav.stdconfig import NoUnicodePlistParser, PListConfigProvider,\
</span><del>- _updateDataStore, _updateMultiProcess
</del><ins>+ _updateDataStore, _updateMultiProcess, _updateUtilityLog
</ins><span class="cx"> import twistedcaldav.stdconfig
</span><ins>+import sys
+import os
</ins><span class="cx">
</span><span class="cx"> nonASCIIValue = "→←"
</span><span class="cx"> nonASCIIPlist = "<plist version='1.0'><string>%s</string></plist>" % (
</span><span class="lines">@@ -174,3 +176,17 @@
</span><span class="cx"> _updateMultiProcess(configDict)
</span><span class="cx"> self.assertEquals(45, configDict.Postgres.MaxConnections)
</span><span class="cx"> self.assertEquals(67, configDict.Postgres.SharedBuffers)
</span><ins>+
+
+ def test_updateUtilityLog(self):
+ configDict = {
+ "ServerRoot" : "/a/b/c/",
+ "LogRoot" : "Logs",
+ "UtilityLogFile" : "util.txt",
+ }
+ _updateUtilityLog(configDict)
+ self.assertEquals(configDict["UtilityLogFile"], "{}.log".format(os.path.basename(sys.argv[0])))
+
+ _updateDataStore(configDict)
+ _updateUtilityLog(configDict)
+ self.assertEquals(configDict["UtilityLogFile"], "/a/b/c/Logs/{}.log".format(os.path.basename(sys.argv[0])))
</ins></span></pre>
</div>
</div>
</body>
</html>