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

[source_changes at macosforge.org]

Revision: 11669
          http://trac.calendarserver.org//changeset/11669
Author:   sagen at apple.com
Date:     2013-09-11 13:41:03 -0700 (Wed, 11 Sep 2013)
Log Message:
-----------
Don't hang if we are unable to make our initial connection to postgres.

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-09-11 18:47:57 UTC (rev 11668)
+++ CalendarServer/trunk/txdav/base/datastore/subpostgres.py	2013-09-11 20:41:03 UTC (rev 11669)
@@ -463,7 +463,7 @@
                 env=self.env, path=self.workingDir.path,
                 uid=self.uid, gid=self.gid,
             )
-            d.addCallback(gotStatus)
+            return d.addCallback(gotStatus)
 
         def reportit(f):
             log.failure("starting postgres", f)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130911/fd0cd072/attachment.html>