<!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>[13409] 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/13409">13409</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2014-05-02 14:02:52 -0700 (Fri, 02 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Postgres logs will live inside LogRoot on OS X Server</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcalendarservertaputilpy">CalendarServer/trunk/calendarserver/tap/util.py</a></li>
<li><a href="#CalendarServertrunkconfcaldavdappleplist">CalendarServer/trunk/conf/caldavd-apple.plist</a></li>
<li><a href="#CalendarServertrunktwistedcaldavstdconfigpy">CalendarServer/trunk/twistedcaldav/stdconfig.py</a></li>
<li><a href="#CalendarServertrunktxdavbasedatastoresubpostgrespy">CalendarServer/trunk/txdav/base/datastore/subpostgres.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkcalendarservertaputilpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tap/util.py (13408 => 13409)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tap/util.py 2014-05-02 20:07:26 UTC (rev 13408)
+++ CalendarServer/trunk/calendarserver/tap/util.py 2014-05-02 21:02:52 UTC (rev 13409)
</span><span class="lines">@@ -127,6 +127,7 @@
</span><span class="cx"> databaseName=config.Postgres.DatabaseName,
</span><span class="cx"> clusterName=config.Postgres.ClusterName,
</span><span class="cx"> logFile=config.Postgres.LogFile,
</span><ins>+ logDirectory=config.LogRoot if config.Postgres.LogRotation else "",
</ins><span class="cx"> socketDir=config.Postgres.SocketDirectory,
</span><span class="cx"> listenAddresses=config.Postgres.ListenAddresses,
</span><span class="cx"> sharedBuffers=config.Postgres.SharedBuffers,
</span></span></pre></div>
<a id="CalendarServertrunkconfcaldavdappleplist"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/conf/caldavd-apple.plist (13408 => 13409)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/conf/caldavd-apple.plist 2014-05-02 20:07:26 UTC (rev 13408)
+++ CalendarServer/trunk/conf/caldavd-apple.plist 2014-05-02 21:02:52 UTC (rev 13409)
</span><span class="lines">@@ -111,11 +111,6 @@
</span><span class="cx"> <string>-c log_lock_waits=TRUE</string>
</span><span class="cx"> <string>-c deadlock_timeout=10</string>
</span><span class="cx"> <string>-c log_line_prefix='%m [%p] '</string>
</span><del>- <string>-c logging_collector=on</string>
- <string>-c log_truncate_on_rotation=on</string>
- <string>-c log_directory=/var/log/caldavd/postgresql</string>
- <string>-c log_filename=postgresql_%w.log</string>
- <string>-c log_rotation_age=1440</string>
</del><span class="cx"> </array>
</span><span class="cx"> <key>ExtraConnections</key>
</span><span class="cx"> <integer>20</integer>
</span><span class="lines">@@ -125,6 +120,8 @@
</span><span class="cx"> <string>xpg_ctl.log</string>
</span><span class="cx"> <key>SocketDirectory</key>
</span><span class="cx"> <string>/var/run/caldavd/PostgresSocket</string>
</span><ins>+ <key>LogRotation</key>
+ <true/>
</ins><span class="cx"> </dict>
</span><span class="cx">
</span><span class="cx"> <!-- Data root -->
</span><span class="lines">@@ -212,7 +209,7 @@
</span><span class="cx"> <dict>
</span><span class="cx"> <key>type</key>
</span><span class="cx"> <string>twistedcaldav.directory.appleopendirectory.OpenDirectoryService</string>
</span><del>-
</del><ins>+
</ins><span class="cx"> <key>params</key>
</span><span class="cx"> <dict>
</span><span class="cx"> <key>node</key>
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavstdconfigpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/stdconfig.py (13408 => 13409)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/stdconfig.py 2014-05-02 20:07:26 UTC (rev 13408)
+++ CalendarServer/trunk/twistedcaldav/stdconfig.py 2014-05-02 21:02:52 UTC (rev 13409)
</span><span class="lines">@@ -990,6 +990,7 @@
</span><span class="cx"> "DatabaseName": "caldav",
</span><span class="cx"> "ClusterName": "cluster",
</span><span class="cx"> "LogFile": "postgres.log",
</span><ins>+ "LogRotation": False,
</ins><span class="cx"> "SocketDirectory": "",
</span><span class="cx"> "ListenAddresses": [],
</span><span class="cx"> "SharedBuffers": 0, # BuffersToConnectionsRatio * MaxConnections
</span></span></pre></div>
<a id="CalendarServertrunktxdavbasedatastoresubpostgrespy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/base/datastore/subpostgres.py (13408 => 13409)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/base/datastore/subpostgres.py 2014-05-02 20:07:26 UTC (rev 13408)
+++ CalendarServer/trunk/txdav/base/datastore/subpostgres.py 2014-05-02 21:02:52 UTC (rev 13409)
</span><span class="lines">@@ -167,7 +167,9 @@
</span><span class="cx"> def __init__(self, dataStoreDirectory, subServiceFactory,
</span><span class="cx"> schema, resetSchema=False, databaseName='subpostgres',
</span><span class="cx"> clusterName="cluster",
</span><del>- logFile="postgres.log", socketDir="",
</del><ins>+ logFile="postgres.log",
+ logDirectory="",
+ socketDir="",
</ins><span class="cx"> listenAddresses=[], sharedBuffers=30,
</span><span class="cx"> maxConnections=20, options=[],
</span><span class="cx"> testMode=False,
</span><span class="lines">@@ -218,6 +220,7 @@
</span><span class="cx"> # Make logFile absolute in case the working directory of postgres is
</span><span class="cx"> # elsewhere:
</span><span class="cx"> self.logFile = os.path.abspath(logFile)
</span><ins>+ self.logDirectory = os.path.abspath(logDirectory) if logDirectory else ""
</ins><span class="cx">
</span><span class="cx"> # Always use our own configured socket dir in case the built-in postgres tries to use
</span><span class="cx"> # a directory we don't have permissions for
</span><span class="lines">@@ -420,8 +423,14 @@
</span><span class="cx"> options.append("-c standard_conforming_strings=on")
</span><span class="cx"> options.append("-c unix_socket_permissions=0770")
</span><span class="cx"> options.extend(self.options)
</span><ins>+ if self.logDirectory: # tell postgres to rotate logs
+ options.append("-c log_directory={}".format(self.logDirectory))
+ options.append("-c log_truncate_on_rotation=on")
+ options.append("-c log_filename=postgresql_%w.log")
+ options.append("-c log_rotation_age=1440")
+ options.append("-c logging_collector=on")
</ins><span class="cx">
</span><del>- log.warn("Requesting postgres start via {cmd}", cmd=pgCtl)
</del><ins>+ log.warn("Requesting postgres start via {cmd} {opts}", cmd=pgCtl, opts=options)
</ins><span class="cx"> self.reactor.spawnProcess(
</span><span class="cx"> monitor, pgCtl,
</span><span class="cx"> [
</span></span></pre>
</div>
</div>
</body>
</html>