<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[14444] CalendarServer/trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.calendarserver.org//changeset/14444">14444</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2015-02-19 12:11:01 -0800 (Thu, 19 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>DB code cleanup</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktwistedcaldavdatabasepy">CalendarServer/trunk/twistedcaldav/database.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavdirectorytesttest_proxyprincipaldbpy">CalendarServer/trunk/twistedcaldav/directory/test/test_proxyprincipaldb.py</a></li>
<li><a href="#CalendarServertrunktxdavbasedatastoresubpostgrespy">CalendarServer/trunk/txdav/base/datastore/subpostgres.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunktwistedcaldavdatabasepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/database.py (14443 => 14444)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/database.py 2015-02-19 20:05:52 UTC (rev 14443)
+++ CalendarServer/trunk/twistedcaldav/database.py 2015-02-19 20:11:01 UTC (rev 14444)
</span><span class="lines">@@ -17,10 +17,9 @@
</span><span class="cx"> import thread
</span><span class="cx">
</span><span class="cx"> try:
</span><del>- import pgdb
</del><ins>+ import pgdb as postgres
</ins><span class="cx"> except:
</span><del>- pgdb = None
-# pgdb = None
</del><ins>+ postgres = None
</ins><span class="cx">
</span><span class="cx"> from twisted.enterprise.adbapi import ConnectionPool
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks, returnValue
</span><span class="lines">@@ -571,7 +570,7 @@
</span><span class="cx"> # internal statements so we do not need to remap those
</span><span class="cx"> return sql
</span><span class="cx">
</span><del>-if pgdb:
</del><ins>+if postgres:
</ins><span class="cx">
</span><span class="cx"> class ADBAPIPostgreSQLMixin(object):
</span><span class="cx">
</span><span class="lines">@@ -608,7 +607,7 @@
</span><span class="cx">
</span><span class="cx"> try:
</span><span class="cx"> yield self._db_execute(statement)
</span><del>- except pgdb.DatabaseError:
</del><ins>+ except postgres.DatabaseError:
</ins><span class="cx">
</span><span class="cx"> if not ifnotexists:
</span><span class="cx"> raise
</span><span class="lines">@@ -638,7 +637,7 @@
</span><span class="cx">
</span><span class="cx"> try:
</span><span class="cx"> yield self._db_execute(statement)
</span><del>- except pgdb.DatabaseError:
</del><ins>+ except postgres.DatabaseError:
</ins><span class="cx">
</span><span class="cx"> if not ifnotexists:
</span><span class="cx"> raise
</span><span class="lines">@@ -677,7 +676,7 @@
</span><span class="cx"> values ('TYPE', :1)
</span><span class="cx"> """, (self._db_type(),)
</span><span class="cx"> )
</span><del>- except pgdb.DatabaseError:
</del><ins>+ except postgres.DatabaseError:
</ins><span class="cx"> pass
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavdirectorytesttest_proxyprincipaldbpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/directory/test/test_proxyprincipaldb.py (14443 => 14444)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/directory/test/test_proxyprincipaldb.py 2015-02-19 20:05:52 UTC (rev 14443)
+++ CalendarServer/trunk/twistedcaldav/directory/test/test_proxyprincipaldb.py 2015-02-19 20:11:01 UTC (rev 14444)
</span><span class="lines">@@ -598,11 +598,11 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> try:
</span><del>- import pgdb
</del><ins>+ import pgdb as postgres
</ins><span class="cx"> except ImportError:
</span><span class="cx"> ProxyPrincipalDBPostgreSQL.skip = True
</span><span class="cx"> else:
</span><span class="cx"> try:
</span><del>- db = pgdb.connect(host="localhost", database="proxies")
</del><ins>+ db = postgres.connect(host="localhost", database="proxies")
</ins><span class="cx"> except:
</span><span class="cx"> ProxyPrincipalDBPostgreSQL.skip = True
</span></span></pre></div>
<a id="CalendarServertrunktxdavbasedatastoresubpostgrespy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/base/datastore/subpostgres.py (14443 => 14444)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/base/datastore/subpostgres.py 2015-02-19 20:05:52 UTC (rev 14443)
+++ CalendarServer/trunk/txdav/base/datastore/subpostgres.py 2015-02-19 20:11:01 UTC (rev 14444)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> from hashlib import md5
</span><span class="cx"> from pipes import quote as shell_quote
</span><span class="cx">
</span><del>-import pgdb
</del><ins>+import pgdb as postgres
</ins><span class="cx">
</span><span class="cx"> from twisted.python.procutils import which
</span><span class="cx"> from twisted.internet.protocol import ProcessProtocol
</span><span class="lines">@@ -254,6 +254,7 @@
</span><span class="cx"> self.port = None
</span><span class="cx"> self.listenAddresses = []
</span><span class="cx">
</span><ins>+ self.testMode = testMode
</ins><span class="cx"> self.sharedBuffers = sharedBuffers if not testMode else 16
</span><span class="cx"> self.maxConnections = maxConnections if not testMode else 8
</span><span class="cx"> self.options = options
</span><span class="lines">@@ -292,20 +293,20 @@
</span><span class="cx">
</span><span class="cx"> def activateDelayedShutdown(self):
</span><span class="cx"> """
</span><del>- Call this when starting database initialization code to protect against
- shutdown.
</del><ins>+ Call this when starting database initialization code to
+ protect against shutdown.
</ins><span class="cx">
</span><del>- Sets the delayedShutdown flag to True so that if reactor shutdown
- commences, the shutdown will be delayed until deactivateDelayedShutdown
- is called.
</del><ins>+ Sets the delayedShutdown flag to True so that if reactor
+ shutdown commences, the shutdown will be delayed until
+ deactivateDelayedShutdown is called.
</ins><span class="cx"> """
</span><span class="cx"> self.delayedShutdown = True
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> def deactivateDelayedShutdown(self):
</span><span class="cx"> """
</span><del>- Call this when database initialization code has completed so that the
- reactor can shutdown.
</del><ins>+ Call this when database initialization code has completed so
+ that the reactor can shutdown.
</ins><span class="cx"> """
</span><span class="cx"> self.delayedShutdown = False
</span><span class="cx"> if self.shutdownDeferred:
</span><span class="lines">@@ -331,7 +332,7 @@
</span><span class="cx"> if self.port:
</span><span class="cx"> kwargs["host"] = "{}:{}".format(self.host, self.port)
</span><span class="cx">
</span><del>- return DBAPIConnector(pgdb, postgresPreflight, dsn, **kwargs)
</del><ins>+ return DBAPIConnector(postgres, postgresPreflight, dsn, **kwargs)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def produceConnection(self, label="<unlabeled>", databaseName=None):
</span><span class="lines">@@ -353,7 +354,7 @@
</span><span class="cx"> createDatabaseCursor.execute(
</span><span class="cx"> "drop database {}".format(self.databaseName)
</span><span class="cx"> )
</span><del>- except pgdb.DatabaseError:
</del><ins>+ except postgres.DatabaseError:
</ins><span class="cx"> pass
</span><span class="cx">
</span><span class="cx"> try:
</span><span class="lines">@@ -420,9 +421,16 @@
</span><span class="cx"> """
</span><span class="cx">
</span><span class="cx"> def createConnection():
</span><del>- createDatabaseConn = self.produceConnection(
- "schema creation", "postgres"
- )
</del><ins>+ try:
+ createDatabaseConn = self.produceConnection(
+ "schema creation", "postgres"
+ )
+ except postgres.DatabaseError as e:
+ log.error(
+ "Unable to connect to database for schema creation: {error}",
+ error=e
+ )
+ raise
</ins><span class="cx"> createDatabaseCursor = createDatabaseConn.cursor()
</span><span class="cx"> createDatabaseCursor.execute("commit")
</span><span class="cx"> return createDatabaseConn, createDatabaseCursor
</span><span class="lines">@@ -465,6 +473,10 @@
</span><span class="cx"> options.append("-c log_rotation_age=1440")
</span><span class="cx"> options.append("-c logging_collector=on")
</span><span class="cx">
</span><ins>+ options.append("-c log_line_prefix=%t")
+ if self.testMode:
+ options.append("-c log_statement=all")
+
</ins><span class="cx"> log.warn(
</span><span class="cx"> "Requesting postgres start via {cmd} {opts}",
</span><span class="cx"> cmd=pgCtl, opts=options
</span></span></pre>
</div>
</div>
</body>
</html>