<!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>[15325] 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/15325">15325</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-11-17 08:31:59 -0800 (Tue, 17 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Report schema check as failed if the check itself never gets to run because of some other fatal error.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcalendarservertaputilpy">CalendarServer/trunk/calendarserver/tap/util.py</a></li>
<li><a href="#CalendarServertrunkcalendarservertoolsupgradepy">CalendarServer/trunk/calendarserver/tools/upgrade.py</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresqlpy">CalendarServer/trunk/txdav/common/datastore/sql.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkcalendarservertaputilpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tap/util.py (15324 => 15325)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tap/util.py 2015-11-16 21:03:24 UTC (rev 15324)
+++ CalendarServer/trunk/calendarserver/tap/util.py 2015-11-17 16:31:59 UTC (rev 15325)
</span><span class="lines">@@ -1148,24 +1148,15 @@
</span><span class="cx"> return succeed(result)
</span><span class="cx">
</span><span class="cx">
</span><del>- def defaultStepWithFailure(self, failure):
</del><ins>+ def defaultStepWithFailure(self, failure, step):
</ins><span class="cx"> if failure.type not in (
</span><span class="cx"> NotAllowedToUpgrade, ConfigurationError,
</span><span class="cx"> OpenSSL.SSL.Error
</span><span class="cx"> ):
</span><del>- log.failure("Step failure", failure=failure)
</del><ins>+ log.failure("Step failure: {name}", name=step.__class__.__name__, failure=failure)
</ins><span class="cx"> return failure
</span><span class="cx">
</span><del>- # def protectStep(self, callback):
- # def _protected(result):
- # try:
- # return callback(result)
- # except Exception, e:
- # # TODO: how to turn Exception into Failure
- # return Failure()
- # return _protected
</del><span class="cx">
</span><del>-
</del><span class="cx"> def start(self, result=None):
</span><span class="cx"> """
</span><span class="cx"> Begin executing the added steps in sequence. If a step object
</span><span class="lines">@@ -1188,11 +1179,13 @@
</span><span class="cx"> callBack = self.defaultStepWithResult
</span><span class="cx"> if hasattr(step, "stepWithFailure"):
</span><span class="cx"> errBack = step.stepWithFailure
</span><ins>+ errbackArgs = ()
</ins><span class="cx"> else:
</span><span class="cx"> errBack = self.defaultStepWithFailure
</span><ins>+ errbackArgs = (step,)
</ins><span class="cx">
</span><span class="cx"> # Add callbacks to the Deferred
</span><del>- self.deferred.addCallbacks(callBack, errBack)
</del><ins>+ self.deferred.addCallbacks(callBack, errBack, errbackArgs=errbackArgs)
</ins><span class="cx">
</span><span class="cx"> # Get things going
</span><span class="cx"> self.deferred.callback(result)
</span></span></pre></div>
<a id="CalendarServertrunkcalendarservertoolsupgradepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tools/upgrade.py (15324 => 15325)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tools/upgrade.py 2015-11-16 21:03:24 UTC (rev 15324)
+++ CalendarServer/trunk/calendarserver/tools/upgrade.py 2015-11-17 16:31:59 UTC (rev 15325)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> from txdav.common.datastore.sql import CommonDataStore
</span><span class="cx">
</span><span class="cx"> from twisted.internet.defer import succeed
</span><del>-from twisted.logger import LogLevel, formatEvent
</del><ins>+from twisted.logger import LogLevel, formatEvent, formatTime
</ins><span class="cx"> from twisted.logger import FilteringLogObserver, LogLevelFilterPredicate
</span><span class="cx"> from twisted.python.text import wordWrap
</span><span class="cx"> from twisted.python.usage import Options, UsageError
</span><span class="lines">@@ -150,10 +150,14 @@
</span><span class="cx"> if self.options["status"]:
</span><span class="cx"> self.output.write("Database OK.\n")
</span><span class="cx"> elif self.options["check"]:
</span><del>- if hasattr(CommonDataStore, "checkSchemaResults"):
- self.output.write("Database check failed:\n{}\n".format("\n".join(CommonDataStore.checkSchemaResults))) #@UndefinedVariable
</del><ins>+ checkResult = getattr(CommonDataStore, "checkSchemaResults", None)
+ if checkResult is not None:
+ if checkResult:
+ self.output.write("Database check FAILED:\n{}\n".format("\n".join(checkResult)))
+ else:
+ self.output.write("Database check OK.\n")
</ins><span class="cx"> else:
</span><del>- self.output.write("Database check OK.\n")
</del><ins>+ self.output.write("Database check FAILED.\n")
</ins><span class="cx"> else:
</span><span class="cx"> self.output.write("Upgrade complete, shutting down.\n")
</span><span class="cx"> UpgraderService.started = True
</span><span class="lines">@@ -167,10 +171,14 @@
</span><span class="cx"> if self.options["status"]:
</span><span class="cx"> self.output.write("Upgrade needed.\n")
</span><span class="cx"> elif self.options["check"]:
</span><del>- if hasattr(CommonDataStore, "checkSchemaResults"):
- self.output.write("Database check failed:\n{}\n".format("\n".join(CommonDataStore.checkSchemaResults))) #@UndefinedVariable
</del><ins>+ checkResult = getattr(CommonDataStore, "checkSchemaResults", None)
+ if checkResult is not None:
+ if checkResult:
+ self.output.write("Database check FAILED:\n{}\n".format("\n".join(checkResult)))
+ else:
+ self.output.write("Database check OK.\n")
</ins><span class="cx"> else:
</span><del>- self.output.write("Database check OK.\n")
</del><ins>+ self.output.write("Database check FAILED.\n")
</ins><span class="cx"> else:
</span><span class="cx"> self.output.write("Upgrade failed.\n")
</span><span class="cx"> UpgraderService.started = True
</span><span class="lines">@@ -230,7 +238,7 @@
</span><span class="cx">
</span><span class="cx"> def onlyUpgradeEvents(eventDict):
</span><span class="cx"> text = formatEvent(eventDict)
</span><del>- output.write(logDateString() + " " + text + "\n")
</del><ins>+ output.write(formatTime(eventDict.get("log_time", time.time())) + " " + text + "\n")
</ins><span class="cx"> output.flush()
</span><span class="cx">
</span><span class="cx"> if not options["status"] and not options["check"]:
</span><span class="lines">@@ -263,28 +271,5 @@
</span><span class="cx"> utilityMain(options["config"], makeService, reactor, customServiceMaker, patchConfig=_patchConfig, onShutdown=_onShutdown, verbose=options["debug"])
</span><span class="cx">
</span><span class="cx">
</span><del>-
-def logDateString():
- logtime = time.localtime()
- Y, M, D, h, m, s = logtime[:6]
- tz = computeTimezoneForLog(time.timezone)
-
- return '%02d-%02d-%02d %02d:%02d:%02d%s' % (Y, M, D, h, m, s, tz)
-
-
-
-def computeTimezoneForLog(tz):
- if tz > 0:
- neg = 1
- else:
- neg = 0
- tz = -tz
- h, rem = divmod(tz, 3600)
- m, rem = divmod(rem, 60)
- if neg:
- return '-%02d%02d' % (h, m)
- else:
- return '+%02d%02d' % (h, m)
-
</del><span class="cx"> if __name__ == '__main__':
</span><span class="cx"> main()
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql.py (15324 => 15325)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql.py 2015-11-16 21:03:24 UTC (rev 15324)
+++ CalendarServer/trunk/txdav/common/datastore/sql.py 2015-11-17 16:31:59 UTC (rev 15325)
</span><span class="lines">@@ -404,9 +404,8 @@
</span><span class="cx"> try:
</span><span class="cx"> actual_schema = yield dumpSchema(txn, "actual", schema_name)
</span><span class="cx"> results = actual_schema.compare(expected_schema)
</span><ins>+ self.__class__.checkSchemaResults = results
</ins><span class="cx"> if results:
</span><del>- if not hasattr(self.__class__, "checkSchemaResults"):
- self.__class__.checkSchemaResults = results
</del><span class="cx"> log.warn("Schema comparison mismatch:\n{}".format("\n".join(results)))
</span><span class="cx"> else:
</span><span class="cx"> log.warn("Schema comparison match")
</span></span></pre>
</div>
</div>
</body>
</html>