[CalendarServer-changes] [14824] CalendarServer/trunk/txdav/base/datastore/subpostgres.py

[source_changes at macosforge.org]

Revision: 14824
          http://trac.calendarserver.org//changeset/14824
Author:   sagen at apple.com
Date:     2015-05-25 15:46:35 -0700 (Mon, 25 May 2015)
Log Message:
-----------
pass unicodes to logger

Modified Paths:
--------------
    CalendarServer/trunk/txdav/base/datastore/subpostgres.py

Modified: CalendarServer/trunk/txdav/base/datastore/subpostgres.py
===================================================================
--- CalendarServer/trunk/txdav/base/datastore/subpostgres.py	2015-05-23 00:19:30 UTC (rev 14823)
+++ CalendarServer/trunk/txdav/base/datastore/subpostgres.py	2015-05-25 22:46:35 UTC (rev 14824)
@@ -592,7 +592,7 @@
 
         if self.socketDir:
             if not self.socketDir.isdir():
-                log.info("Creating {dir}", dir=self.socketDir.path)
+                log.info("Creating {dir}", dir=self.socketDir.path.decode("utf-8"))
                 self.socketDir.createDirectory()
 
             if self.uid and self.gid:
@@ -601,11 +601,11 @@
             os.chmod(self.socketDir.path, 0770)
 
         if not self.dataStoreDirectory.isdir():
-            log.info("Creating {dir}", dir=self.dataStoreDirectory.path)
+            log.info("Creating {dir}", dir=self.dataStoreDirectory.path.decode("utf-8"))
             self.dataStoreDirectory.createDirectory()
 
         if not self.workingDir.isdir():
-            log.info("Creating {dir}", dir=self.workingDir.path)
+            log.info("Creating {dir}", dir=self.workingDir.path.decode("utf-8"))
             self.workingDir.createDirectory()
 
         if self.uid and self.gid:
@@ -614,7 +614,7 @@
 
         if not clusterDir.isdir():
             # No cluster directory, run initdb
-            log.info("Running initdb for {dir}", dir=clusterDir.path)
+            log.info("Running initdb for {dir}", dir=clusterDir.path.decode("utf-8"))
             dbInited = Deferred()
             self.reactor.spawnProcess(
                 CapturingProcessProtocol(dbInited, None),
@@ -636,7 +636,7 @@
             dbInited.addCallback(doCreate)
 
         else:
-            log.info("Cluster already exists at {dir}", dir=clusterDir.path)
+            log.info("Cluster already exists at {dir}", dir=clusterDir.path.decode("utf-8"))
             self.startDatabase()
 
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150525/815bbe08/attachment.html>