<!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>[15145] twext/trunk/twext/enterprise</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/15145">15145</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-09-22 11:16:52 -0700 (Tue, 22 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Additional logging.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#twexttrunktwextenterprisedalrecordpy">twext/trunk/twext/enterprise/dal/record.py</a></li>
<li><a href="#twexttrunktwextenterprisejobsqueuepy">twext/trunk/twext/enterprise/jobs/queue.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="twexttrunktwextenterprisedalrecordpy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/enterprise/dal/record.py (15144 => 15145)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/enterprise/dal/record.py 2015-09-22 18:03:08 UTC (rev 15144)
+++ twext/trunk/twext/enterprise/dal/record.py 2015-09-22 18:16:52 UTC (rev 15145)
</span><span class="lines">@@ -35,8 +35,9 @@
</span><span class="cx"> Count, ALL_COLUMNS)
</span><span class="cx"> from twext.enterprise.ienterprise import ORACLE_DIALECT
</span><span class="cx"> from twext.enterprise.util import parseSQLTimestamp
</span><del>-# from twext.enterprise.dal.syntax import ExpressionSyntax
</del><ins>+from twext.python.log import Logger
</ins><span class="cx">
</span><ins>+log = Logger()
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> class ReadOnly(AttributeError):
</span><span class="lines">@@ -444,6 +445,10 @@
</span><span class="cx"> NoWait=True,
</span><span class="cx"> ).on(self.transaction)
</span><span class="cx"> except:
</span><ins>+ log.debug("trylock failed: {item} {where}".format(
+ name=repr(self),
+ where=str(where),
+ ))
</ins><span class="cx"> yield savepoint.rollback(self.transaction)
</span><span class="cx"> returnValue(False)
</span><span class="cx"> else:
</span></span></pre></div>
<a id="twexttrunktwextenterprisejobsqueuepy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/enterprise/jobs/queue.py (15144 => 15145)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/enterprise/jobs/queue.py 2015-09-22 18:03:08 UTC (rev 15144)
+++ twext/trunk/twext/enterprise/jobs/queue.py 2015-09-22 18:16:52 UTC (rev 15145)
</span><span class="lines">@@ -582,13 +582,14 @@
</span><span class="cx"> break
</span><span class="cx">
</span><span class="cx"> # Always assign as a new job even when it is an orphan
</span><ins>+ log.debug("workCheck: assigned job: {jobID}".format(jobID=nextJob.jobID))
</ins><span class="cx"> yield nextJob.assign(nowTime, self.queueOverdueTimeout)
</span><span class="cx"> self._timeOfLastWork = time.time()
</span><span class="cx"> loopCounter += 1
</span><span class="cx">
</span><span class="cx"> except Exception as e:
</span><span class="cx"> log.error(
</span><del>- "Failed to pick a new job: {jobID}, {exc}",
</del><ins>+ "workCheck: Failed to pick a new job: {jobID}, {exc}",
</ins><span class="cx"> jobID=nextJob.jobID if nextJob else "?",
</span><span class="cx"> exc=e,
</span><span class="cx"> )
</span><span class="lines">@@ -609,7 +610,7 @@
</span><span class="cx"> except Exception as e:
</span><span class="cx"> # Could not mark as failed - break out of the next job loop
</span><span class="cx"> log.error(
</span><del>- "Failed to mark failed new job:{}, {exc}",
</del><ins>+ "workCheck: Failed to mark failed new job:{}, {exc}",
</ins><span class="cx"> jobID=nextJob.jobID,
</span><span class="cx"> exc=e,
</span><span class="cx"> )
</span><span class="lines">@@ -619,13 +620,13 @@
</span><span class="cx"> break
</span><span class="cx"> else:
</span><span class="cx"> # Marked the problem one as failed, so keep going and get the next job
</span><del>- log.error("Marked failed new job: {jobID}", jobID=nextJob.jobID)
</del><ins>+ log.error("workCheck: Marked failed new job: {jobID}", jobID=nextJob.jobID)
</ins><span class="cx"> yield txn.commit()
</span><span class="cx"> txn = None
</span><span class="cx"> nextJob = None
</span><span class="cx"> else:
</span><span class="cx"> # Cannot mark anything as failed - break out of next job loop
</span><del>- log.error("Cannot mark failed new job")
</del><ins>+ log.error("workCheck: Cannot mark failed new job")
</ins><span class="cx"> break
</span><span class="cx"> finally:
</span><span class="cx"> if txn is not None:
</span><span class="lines">@@ -640,7 +641,7 @@
</span><span class="cx"> # we can do stuff in parallel
</span><span class="cx"> worker.performJob(nextJob.descriptor())
</span><span class="cx"> except Exception as e:
</span><del>- log.error("Failed to perform job for jobid={jobid}, {exc}", jobid=nextJob.jobID, exc=e)
</del><ins>+ log.error("workCheck: Failed to perform job for jobid={jobid}, {exc}", jobid=nextJob.jobID, exc=e)
</ins><span class="cx">
</span><span class="cx"> if loopCounter:
</span><span class="cx"> log.debug("workCheck: processed {ctr} jobs in one loop", ctr=loopCounter)
</span><span class="lines">@@ -677,7 +678,7 @@
</span><span class="cx"> interval = poll
</span><span class="cx"> break
</span><span class="cx"> if self._actualPollInterval != interval:
</span><del>- log.debug("workCheckLoop: interval set to {interval}s", interval=interval)
</del><ins>+ log.debug("_workCheckLoop: interval set to {interval}s", interval=interval)
</ins><span class="cx"> self._actualPollInterval = interval
</span><span class="cx"> self._workCheckCall = self.reactor.callLater(
</span><span class="cx"> self._actualPollInterval, self._workCheckLoop
</span><span class="lines">@@ -731,7 +732,7 @@
</span><span class="cx">
</span><span class="cx"> except Exception as e:
</span><span class="cx"> log.error(
</span><del>- "Failed to process overdue job: {jobID}, {exc}",
</del><ins>+ "overdueCheck: Failed to process overdue job: {jobID}, {exc}",
</ins><span class="cx"> jobID=overdueJob.jobID if overdueJob else "?",
</span><span class="cx"> exc=e,
</span><span class="cx"> )
</span><span class="lines">@@ -752,7 +753,7 @@
</span><span class="cx"> except Exception as e:
</span><span class="cx"> # Could not mark as failed - break out of the overdue job loop
</span><span class="cx"> log.error(
</span><del>- "Failed to mark failed overdue job:{}, {exc}",
</del><ins>+ "overdueCheck: Failed to mark failed overdue job:{}, {exc}",
</ins><span class="cx"> jobID=overdueJob.jobID,
</span><span class="cx"> exc=e,
</span><span class="cx"> )
</span><span class="lines">@@ -762,13 +763,13 @@
</span><span class="cx"> break
</span><span class="cx"> else:
</span><span class="cx"> # Marked the problem one as failed, so keep going and get the next overdue job
</span><del>- log.error("Marked failed overdue job: {jobID}", jobID=overdueJob.jobID)
</del><ins>+ log.error("overdueCheck: Marked failed overdue job: {jobID}", jobID=overdueJob.jobID)
</ins><span class="cx"> yield txn.commit()
</span><span class="cx"> txn = None
</span><span class="cx"> overdueJob = None
</span><span class="cx"> else:
</span><span class="cx"> # Cannot mark anything as failed - break out of overdue job loop
</span><del>- log.error("Cannot mark failed overdue job")
</del><ins>+ log.error("overdueCheck: Cannot mark failed overdue job")
</ins><span class="cx"> break
</span><span class="cx"> finally:
</span><span class="cx"> if txn is not None:
</span></span></pre>
</div>
</div>
</body>
</html>