<!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>[13554] twext/trunk/twext/enterprise/jobqueue.py</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/13554">13554</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2014-05-28 19:27:23 -0700 (Wed, 28 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix logging.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#twexttrunktwextenterprisejobqueuepy">twext/trunk/twext/enterprise/jobqueue.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="twexttrunktwextenterprisejobqueuepy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/enterprise/jobqueue.py (13553 => 13554)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/enterprise/jobqueue.py 2014-05-29 01:40:18 UTC (rev 13553)
+++ twext/trunk/twext/enterprise/jobqueue.py 2014-05-29 02:27:23 UTC (rev 13554)
</span><span class="lines">@@ -373,23 +373,28 @@
</span><span class="cx"> def _overtm(nb):
</span><span class="cx"> return "{:.0f}".format(1000 * (t - astimestamp(nb)))
</span><span class="cx">
</span><del>- log.debug("JobItem: {jobid} starting to run".format(jobid=jobID))
</del><ins>+ log.debug("JobItem: {jobid} starting to run", jobid=jobID)
</ins><span class="cx"> txn = txnFactory(label="ultimatelyPerform: {}".format(jobID))
</span><span class="cx"> try:
</span><span class="cx"> job = yield cls.load(txn, jobID)
</span><span class="cx"> if hasattr(txn, "_label"):
</span><span class="cx"> txn._label = "{} <{}>".format(txn._label, job.workType)
</span><del>- log.debug("JobItem: {jobid} loaded {work} t={tm}".format(
</del><ins>+ log.debug(
+ "JobItem: {jobid} loaded {work} t={tm}",
</ins><span class="cx"> jobid=jobID,
</span><span class="cx"> work=job.workType,
</span><del>- tm=_tm())
</del><ins>+ tm=_tm(),
</ins><span class="cx"> )
</span><span class="cx"> yield job.run()
</span><span class="cx">
</span><span class="cx"> except NoSuchRecord:
</span><span class="cx"> # The record has already been removed
</span><span class="cx"> yield txn.commit()
</span><del>- log.debug("JobItem: {jobid} already removed t={tm}".format(jobid=jobID, tm=_tm()))
</del><ins>+ log.debug(
+ "JobItem: {jobid} already removed t={tm}",
+ jobid=jobID,
+ tm=_tm(),
+ )
</ins><span class="cx">
</span><span class="cx"> except JobFailedError:
</span><span class="cx"> # Job failed: abort with cleanup, but pretend this method succeeded
</span><span class="lines">@@ -397,35 +402,43 @@
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def _cleanUp2(txn2):
</span><span class="cx"> job = yield cls.load(txn2, jobID)
</span><del>- log.debug("JobItem: {jobid} marking as failed {count} t={tm}".format(jobid=jobID, count=job.failed + 1, tm=_tm()))
</del><ins>+ log.debug(
+ "JobItem: {jobid} marking as failed {count} t={tm}",
+ jobid=jobID,
+ count=job.failed + 1,
+ tm=_tm(),
+ )
</ins><span class="cx"> yield job.failedToRun()
</span><span class="cx"> return inTransaction(txnFactory, _cleanUp2, "ultimatelyPerform._cleanUp")
</span><span class="cx"> txn.postAbort(_cleanUp)
</span><span class="cx"> yield txn.abort()
</span><del>- log.debug("JobItem: {jobid} failed {work} t={tm}".format(
</del><ins>+ log.debug(
+ "JobItem: {jobid} failed {work} t={tm}",
</ins><span class="cx"> jobid=jobID,
</span><span class="cx"> work=job.workType,
</span><del>- tm=_tm()
- ))
</del><ins>+ tm=_tm(),
+ )
</ins><span class="cx">
</span><span class="cx"> except:
</span><span class="cx"> f = Failure()
</span><del>- log.error("JobItem: {jobid} unknown exception t={tm} {exc}".format(
</del><ins>+ log.error(
+ "JobItem: {jobid} unknown exception t={tm} {exc}",
</ins><span class="cx"> jobid=jobID,
</span><span class="cx"> tm=_tm(),
</span><span class="cx"> exc=f,
</span><del>- ))
</del><ins>+ )
</ins><span class="cx"> yield txn.abort()
</span><span class="cx"> returnValue(f)
</span><span class="cx">
</span><span class="cx"> else:
</span><span class="cx"> yield txn.commit()
</span><del>- log.debug("JobItem: {jobid} completed {work} t={tm} over={over}".format(
</del><ins>+ log.debug(
+ "JobItem: {jobid} completed {work} t={tm} over={over}",
</ins><span class="cx"> jobid=jobID,
</span><span class="cx"> work=job.workType,
</span><span class="cx"> tm=_tm(),
</span><del>- over=_overtm(job.notBefore)
- ))
</del><ins>+ over=_overtm(job.notBefore),
+ )
</ins><span class="cx">
</span><span class="cx"> returnValue(None)
</span><span class="cx">
</span><span class="lines">@@ -519,11 +532,12 @@
</span><span class="cx"> yield workItem.doWork()
</span><span class="cx"> yield workItem.afterWork()
</span><span class="cx"> except Exception as e:
</span><del>- log.error("JobItem: {jobid}, WorkItem: {workid} failed: {exc}".format(
</del><ins>+ log.error(
+ "JobItem: {jobid}, WorkItem: {workid} failed: {exc}",
</ins><span class="cx"> jobid=self.jobID,
</span><span class="cx"> workid=workItem.workID,
</span><span class="cx"> exc=e,
</span><del>- ))
</del><ins>+ )
</ins><span class="cx"> raise JobFailedError(e)
</span><span class="cx">
</span><span class="cx"> try:
</span><span class="lines">@@ -826,11 +840,12 @@
</span><span class="cx"> try:
</span><span class="cx"> yield NamedLock.acquire(self.transaction, self.group)
</span><span class="cx"> except Exception as e:
</span><del>- log.error("JobItem: {jobid}, WorkItem: {workid} lock failed: {exc}".format(
</del><ins>+ log.error(
+ "JobItem: {jobid}, WorkItem: {workid} lock failed: {exc}",
</ins><span class="cx"> jobid=self.jobID,
</span><span class="cx"> workid=self.workID,
</span><span class="cx"> exc=e,
</span><del>- ))
</del><ins>+ )
</ins><span class="cx"> raise JobFailedError(e)
</span><span class="cx">
</span><span class="cx"> try:
</span><span class="lines">@@ -1825,7 +1840,10 @@
</span><span class="cx"> else:
</span><span class="cx"> minPriority = WORK_PRIORITY_LOW
</span><span class="cx"> if self._lastMinPriority != minPriority:
</span><del>- log.debug("workCheck: jobqueue priority limit change: {}".format(minPriority))
</del><ins>+ log.debug(
+ "workCheck: jobqueue priority limit change: {limit}",
+ limit=minPriority,
+ )
</ins><span class="cx"> self._lastMinPriority = minPriority
</span><span class="cx">
</span><span class="cx"> # Determine what the timestamp cutoff
</span><span class="lines">@@ -1868,7 +1886,7 @@
</span><span class="cx"> log.error("Failed to perform job for jobid={jobid}, {exc}", jobid=nextJob.jobID, exc=e)
</span><span class="cx">
</span><span class="cx"> if loopCounter:
</span><del>- log.debug("workCheck: processed {} jobs in one loop".format(loopCounter))
</del><ins>+ log.debug("workCheck: processed {ctr} jobs in one loop", ctr=loopCounter)
</ins><span class="cx">
</span><span class="cx"> _currentWorkDeferred = None
</span><span class="cx"> _workCheckCall = None
</span></span></pre>
</div>
</div>
</body>
</html>