[CalendarServer-changes] [6073] CalendarServer/branches/users/glyph/sql-store/txdav/datastore/ subpostgres.py

[source_changes at macosforge.org]

Revision: 6073
          http://trac.macosforge.org/projects/calendarserver/changeset/6073
Author:   sagen at apple.com
Date:     2010-08-11 19:22:44 -0700 (Wed, 11 Aug 2010)
Log Message:
-----------
Specify user in DSN

Modified Paths:
--------------
    CalendarServer/branches/users/glyph/sql-store/txdav/datastore/subpostgres.py

Modified: CalendarServer/branches/users/glyph/sql-store/txdav/datastore/subpostgres.py
===================================================================
--- CalendarServer/branches/users/glyph/sql-store/txdav/datastore/subpostgres.py	2010-08-12 01:43:56 UTC (rev 6072)
+++ CalendarServer/branches/users/glyph/sql-store/txdav/datastore/subpostgres.py	2010-08-12 02:22:44 UTC (rev 6073)
@@ -19,6 +19,7 @@
 Run and manage PostgreSQL as a subprocess.
 """
 import os
+import pwd
 from hashlib import md5
 
 from twisted.python.procutils import which
@@ -197,15 +198,12 @@
         """
         Some output was received on stdout.
         """
-        print "OUTRECV", data
         self.output.append(data)
 
-
     def errReceived(self, data):
         """
         Some output was received on stderr.
         """
-        print "ERRRECV", data
         self.output.append(data)
 
 
@@ -265,9 +263,14 @@
         """
         if databaseName is None:
             databaseName = self.databaseName
-        connection = pgdb.connect(
-            "%s:dbname=%s" % (self.socketDir.path, databaseName)
-        )
+
+        if self.uid is not None:
+            dsn = "%s:dbname=%s:%s" % (self.socketDir.path, databaseName,
+                pwd.getpwuid(self.uid).pw_name)
+        else:
+            dsn = "%s:dbname=%s" % (self.socketDir.path, databaseName)
+        connection = pgdb.connect(dsn)
+
         w = DiagnosticConnectionWrapper(connection, label)
         c = w.cursor()
         # Turn on standard conforming strings.  This option is _required_ if
@@ -405,10 +408,9 @@
                 os.chown(self.dataStoreDirectory.path, self.uid, self.gid)
                 os.chown(workingDir.path, self.uid, self.gid)
             dbInited = Deferred()
-            print "RUNNING INITDB", initdb, env, workingDir.path, self.uid, self.gid
             reactor.spawnProcess(
                 CapturingProcessProtocol(dbInited, None),
-                initdb, [], env, workingDir.path,
+                initdb, [initdb], env, workingDir.path,
                 uid=self.uid, gid=self.gid,
             )
             def doCreate(result):
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100811/c7d9d89b/attachment.html>