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

[source_changes at macosforge.org]

Revision: 11361
          http://trac.calendarserver.org//changeset/11361
Author:   wsanchez at apple.com
Date:     2013-06-13 17:33:45 -0700 (Thu, 13 Jun 2013)
Log Message:
-----------
log cleanup

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

Modified: CalendarServer/trunk/txdav/base/datastore/subpostgres.py
===================================================================
--- CalendarServer/trunk/txdav/base/datastore/subpostgres.py	2013-06-14 00:33:00 UTC (rev 11360)
+++ CalendarServer/trunk/txdav/base/datastore/subpostgres.py	2013-06-14 00:33:45 UTC (rev 11361)
@@ -75,17 +75,17 @@
 
 
     def outReceived(self, out):
-        log.warn("received postgres stdout %r" % (out,))
+        log.warn("received postgres stdout {out!r}", out=out)
         # self.lineReceiver.dataReceived(out)
 
 
     def errReceived(self, err):
-        log.warn("received postgres stderr %r" % (err,))
+        log.warn("received postgres stderr {err}", err=err)
         self.lineReceiver.dataReceived(err)
 
 
     def processEnded(self, reason):
-        log.warn("postgres process ended with status %d" % (reason.value.status,))
+        log.warn("postgres process ended with status {status}", status=reason.value.status)
         # If pg_ctl exited with zero, we were successful in starting postgres
         # If pg_ctl exited with nonzero, we need to give up.
         self.lineReceiver.connectionLost(reason)
@@ -410,7 +410,7 @@
         except Exception, e:
             # Some other unexpected error is preventing us from connecting
             # to the database
-            log.warn("Failed to connect to Postgres: %s" % (str(e)))
+            log.warn("Failed to connect to Postgres: {e}", e=e)
         else:
             # Database is running, so just use our connection
             self.ready(createDatabaseConn, createDatabaseCursor)
@@ -452,7 +452,7 @@
         )
         self.monitor = monitor
         def gotReady(result):
-            log.warn("%s exited" % (pgCtl,))
+            log.warn("{cmd} exited", cmd=pgCtl)
             self.shouldStopDatabase = True
             self.ready(*createConnection())
             self.deactivateDelayedShutdown()
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130613/5ae749d4/attachment.html>