[CalendarServer-changes] [6264] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 6264
          http://trac.macosforge.org/projects/calendarserver/changeset/6264
Author:   cdaboo at apple.com
Date:     2010-09-09 12:26:54 -0700 (Thu, 09 Sep 2010)
Log Message:
-----------
Unix socket always enabled.

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/tap/caldav.py
    CalendarServer/trunk/calendarserver/tap/util.py
    CalendarServer/trunk/twistedcaldav/stdconfig.py

Modified: CalendarServer/trunk/calendarserver/tap/caldav.py
===================================================================
--- CalendarServer/trunk/calendarserver/tap/caldav.py	2010-09-09 13:16:14 UTC (rev 6263)
+++ CalendarServer/trunk/calendarserver/tap/caldav.py	2010-09-09 19:26:54 UTC (rev 6264)
@@ -725,7 +725,7 @@
                 dbRoot, subServiceFactory, v1_schema,
                 databaseName=config.Postgres.DatabaseName,
                 logFile=config.Postgres.LogFile,
-                socketDir=config.RunRoot if config.Postgres.UnixSocket else None,
+                socketDir=config.RunRoot,
                 listenAddresses=config.Postgres.ListenAddresses,
                 sharedBuffers=config.Postgres.SharedBuffers,
                 maxConnections=config.Postgres.MaxConnections,

Modified: CalendarServer/trunk/calendarserver/tap/util.py
===================================================================
--- CalendarServer/trunk/calendarserver/tap/util.py	2010-09-09 13:16:14 UTC (rev 6263)
+++ CalendarServer/trunk/calendarserver/tap/util.py	2010-09-09 19:26:54 UTC (rev 6264)
@@ -88,7 +88,7 @@
             dbRoot, None, v1_schema,
             databaseName=config.Postgres.DatabaseName,
             logFile=config.Postgres.LogFile,
-            socketDir=config.RunRoot if config.Postgres.UnixSocket else None,
+            socketDir=config.RunRoot,
             listenAddresses=config.Postgres.ListenAddresses,
             sharedBuffers=config.Postgres.SharedBuffers,
             maxConnections=config.Postgres.MaxConnections,

Modified: CalendarServer/trunk/twistedcaldav/stdconfig.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/stdconfig.py	2010-09-09 13:16:14 UTC (rev 6263)
+++ CalendarServer/trunk/twistedcaldav/stdconfig.py	2010-09-09 19:26:54 UTC (rev 6264)
@@ -575,7 +575,6 @@
     "Postgres": {
         "DatabaseName": "caldav",
         "LogFile": "postgres.log",
-        "UnixSocket": True,
         "ListenAddresses": [],
         "SharedBuffers": 30,
         "MaxConnections": 20,
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100909/8e248db4/attachment.html>