<!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>[12031] 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/12031">12031</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2013-12-04 10:02:33 -0800 (Wed, 04 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use a fixed path for postgres socket directory 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="#CalendarServertrunkcalendarservertoolsbackup_pgpy">CalendarServer/trunk/calendarserver/tools/backup_pg.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 (12030 => 12031)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tap/util.py 2013-12-04 03:47:41 UTC (rev 12030)
+++ CalendarServer/trunk/calendarserver/tap/util.py 2013-12-04 18:02:33 UTC (rev 12031)
</span><span class="lines">@@ -130,7 +130,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><del>- socketDir=config.RunRoot,
</del><ins>+ socketDir=config.Postgres.SocketDirectory,
</ins><span class="cx"> listenAddresses=config.Postgres.ListenAddresses,
</span><span class="cx"> sharedBuffers=config.Postgres.SharedBuffers,
</span><span class="cx"> maxConnections=config.Postgres.MaxConnections,
</span></span></pre></div>
<a id="CalendarServertrunkcalendarservertoolsbackup_pgpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tools/backup_pg.py (12030 => 12031)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tools/backup_pg.py 2013-12-04 03:47:41 UTC (rev 12030)
+++ CalendarServer/trunk/calendarserver/tools/backup_pg.py 2013-12-04 18:02:33 UTC (rev 12031)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx">
</span><span class="cx"> PSQL = "%s/usr/bin/psql" % (SIPP,)
</span><span class="cx"> PGDUMP = "%s/usr/bin/pg_dump" % (SIPP,)
</span><del>-PGSOCKETDIR = "/Library/Server/PostgreSQL For Server Services/Socket"
</del><ins>+PGSOCKETDIR = "/var/run/caldavd/PostgresSocket"
</ins><span class="cx">
</span><span class="cx"> def usage(e=None):
</span><span class="cx"> name = os.path.basename(sys.argv[0])
</span></span></pre></div>
<a id="CalendarServertrunkconfcaldavdappleplist"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/conf/caldavd-apple.plist (12030 => 12031)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/conf/caldavd-apple.plist 2013-12-04 03:47:41 UTC (rev 12030)
+++ CalendarServer/trunk/conf/caldavd-apple.plist 2013-12-04 18:02:33 UTC (rev 12031)
</span><span class="lines">@@ -123,6 +123,8 @@
</span><span class="cx"> <string>cluster.pg</string>
</span><span class="cx"> <key>LogFile</key>
</span><span class="cx"> <string>xpg_ctl.log</string>
</span><ins>+ <key>SocketDirectory</key>
+ <string>/var/run/caldavd/PostgresSocket</string>
</ins><span class="cx"> </dict>
</span><span class="cx">
</span><span class="cx"> <!-- Data root -->
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavstdconfigpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/stdconfig.py (12030 => 12031)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/stdconfig.py 2013-12-04 03:47:41 UTC (rev 12030)
+++ CalendarServer/trunk/twistedcaldav/stdconfig.py 2013-12-04 18:02:33 UTC (rev 12031)
</span><span class="lines">@@ -950,6 +950,7 @@
</span><span class="cx"> "DatabaseName": "caldav",
</span><span class="cx"> "ClusterName": "cluster",
</span><span class="cx"> "LogFile": "postgres.log",
</span><ins>+ "SocketDirectory": "",
</ins><span class="cx"> "ListenAddresses": [],
</span><span class="cx"> "SharedBuffers": 0, # BuffersToConnectionsRatio * MaxConnections
</span><span class="cx"> # Note: don't set this, it will be computed dynamically
</span></span></pre></div>
<a id="CalendarServertrunktxdavbasedatastoresubpostgrespy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/base/datastore/subpostgres.py (12030 => 12031)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/base/datastore/subpostgres.py 2013-12-04 03:47:41 UTC (rev 12030)
+++ CalendarServer/trunk/txdav/base/datastore/subpostgres.py 2013-12-04 18:02:33 UTC (rev 12031)
</span><span class="lines">@@ -167,7 +167,7 @@
</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="/tmp",
</del><ins>+ logFile="postgres.log", 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">@@ -223,20 +223,15 @@
</span><span class="cx"> self.host, self.port = listenAddresses[0].split(":") if ":" in listenAddresses[0] else (listenAddresses[0], None,)
</span><span class="cx"> self.listenAddresses = [addr.split(":")[0] for addr in listenAddresses]
</span><span class="cx"> else:
</span><del>- if socketDir:
- # Unix socket length path limit
- self.socketDir = CachingFilePath("%s/ccs_postgres_%s/" %
- (socketDir, md5(dataStoreDirectory.path).hexdigest()))
- if len(self.socketDir.path) > 64:
- socketDir = "/tmp"
- self.socketDir = CachingFilePath("/tmp/ccs_postgres_%s/" %
- (md5(dataStoreDirectory.path).hexdigest()))
- self.host = self.socketDir.path
- self.port = None
- else:
- self.socketDir = None
- self.host = "localhost"
- self.port = None
</del><ins>+ if not socketDir:
+ # Socket directory was not specified, so come up with one
+ # in /tmp and based on a hash of the data store directory
+ digest = md5(dataStoreDirectory.path).hexdigest()
+ socketDir = "/tmp/ccs_postgres_" + digest
+
+ self.socketDir = CachingFilePath(socketDir)
+ self.host = self.socketDir.path
+ self.port = None
</ins><span class="cx"> self.listenAddresses = []
</span><span class="cx"> self.sharedBuffers = sharedBuffers if not testMode else 16
</span><span class="cx"> self.maxConnections = maxConnections if not testMode else 4
</span></span></pre>
</div>
</div>
</body>
</html>