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

[source_changes at macosforge.org]

Revision: 11448
          http://trac.calendarserver.org//changeset/11448
Author:   sagen at apple.com
Date:     2013-07-01 13:06:03 -0700 (Mon, 01 Jul 2013)
Log Message:
-----------
Remove the temporary postgres-connection code from previous commit.

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-07-01 20:03:12 UTC (rev 11447)
+++ CalendarServer/trunk/txdav/base/datastore/subpostgres.py	2013-07-01 20:06:03 UTC (rev 11448)
@@ -401,21 +401,6 @@
             createDatabaseCursor = createDatabaseConn.cursor()
             createDatabaseCursor.execute("commit")
             return createDatabaseConn, createDatabaseCursor
-            
-        try:
-            createDatabaseConn, createDatabaseCursor = createConnection()
-        except pgdb.DatabaseError:
-            # We could not connect the database, so attempt to start it
-            pass
-        except Exception, e:
-            # Some other unexpected error is preventing us from connecting
-            # to the database
-            log.warn("Failed to connect to Postgres: {e}", e=e)
-        else:
-            # Database is running, so just use our connection
-            self.ready(createDatabaseConn, createDatabaseCursor)
-            self.deactivateDelayedShutdown()
-            return
 
         monitor = _PostgresMonitor(self)
         pgCtl = self.pgCtl()
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130701/9813b5f6/attachment.html>