<!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>[12851] CalendarServer/trunk/calendarserver/webadmin</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/12851">12851</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2014-03-07 15:08:46 -0800 (Fri, 07 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Prefix job attrs with "job_".
Handle cases where workItem() returns None without pooching the graph.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcalendarserverwebadminworkpy">CalendarServer/trunk/calendarserver/webadmin/work.py</a></li>
<li><a href="#CalendarServertrunkcalendarserverwebadminworkxhtml">CalendarServer/trunk/calendarserver/webadmin/work.xhtml</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkcalendarserverwebadminworkpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/webadmin/work.py (12850 => 12851)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/webadmin/work.py        2014-03-07 22:22:43 UTC (rev 12850)
+++ CalendarServer/trunk/calendarserver/webadmin/work.py        2014-03-07 23:08:46 UTC (rev 12851)
</span><span class="lines">@@ -31,8 +31,10 @@
</span><span class="cx"> from zope.interface import implementer
</span><span class="cx">
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks, returnValue
</span><del>-# from twisted.web.template import tags as html, renderer
</del><span class="cx">
</span><ins>+from twext.python.log import Logger
+from twext.enterprise.jobqueue import JobItem
+
</ins><span class="cx"> from txdav.caldav.datastore.scheduling.imip.inbound import (
</span><span class="cx"> IMIPPollingWork, IMIPReplyWork
</span><span class="cx"> )
</span><span class="lines">@@ -45,8 +47,6 @@
</span><span class="cx"> ScheduleReplyWork, ScheduleAutoReplyWork,
</span><span class="cx"> )
</span><span class="cx">
</span><del>-from twext.enterprise.jobqueue import JobItem
-
</del><span class="cx"> from .eventsource import EventSourceResource, IEventDecoder
</span><span class="cx"> from .resource import PageElement, TemplateResource
</span><span class="cx">
</span><span class="lines">@@ -90,6 +90,9 @@
</span><span class="cx"> Resource that vends work queue information via HTML5 EventSource events.
</span><span class="cx"> """
</span><span class="cx">
</span><ins>+ log = Logger()
+
+
</ins><span class="cx"> def __init__(self, store, pollInterval=1000):
</span><span class="cx"> EventSourceResource.__init__(self, EventDecoder, bufferSize=100)
</span><span class="cx">
</span><span class="lines">@@ -133,39 +136,61 @@
</span><span class="cx"> jobDicts = []
</span><span class="cx">
</span><span class="cx"> for job in jobs:
</span><ins>+ def formatTime(datetime):
+ if datetime is None:
+ return None
+ else:
+ # FIXME: Use HTTP time format
+ return datetime.ctime()
+
</ins><span class="cx"> jobDict = dict(
</span><del>- jobID=job.jobID,
- priority=job.priority,
- notBefore=job.notBefore.ctime(), # FIXME: HTTP format
- notAfter=job.notAfter,
</del><ins>+ job_jobID=job.jobID,
+ job_priority=job.priority,
+ job_notBefore=formatTime(job.notBefore),
+ job_notAfter=formatTime(job.notAfter),
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> work = yield job.workItem()
</span><span class="cx">
</span><del>- if work is not None:
- if workType == PushNotificationWork:
- attrs = ("pushID", "priority")
- elif workType == ScheduleOrganizerWork:
- attrs = ("icalendarUid", "attendeeCount")
- elif workType == ScheduleRefreshWork:
- attrs = ("icalendarUid", "attendeeCount")
- elif workType == ScheduleReplyWork:
- attrs = ("icalendarUid",)
- elif workType == ScheduleAutoReplyWork:
- attrs = ("icalendarUid",)
- elif workType == GroupCacherPollingWork:
- attrs = ()
- elif workType == IMIPPollingWork:
- attrs = ()
- elif workType == IMIPReplyWork:
- attrs = ("organizer", "attendee")
- else:
- attrs = ()
</del><ins>+ attrs = ("workID", "group")
</ins><span class="cx">
</span><del>- for attr in attrs:
- jobDict["work_{}".format(attr)] = (
- getattr(work, attr)
</del><ins>+ if workType == PushNotificationWork:
+ attrs += ("pushID", "priority")
+ elif workType == ScheduleOrganizerWork:
+ attrs += ("icalendarUid", "attendeeCount")
+ elif workType == ScheduleRefreshWork:
+ attrs += ("icalendarUid", "attendeeCount")
+ elif workType == ScheduleReplyWork:
+ attrs += ("icalendarUid",)
+ elif workType == ScheduleAutoReplyWork:
+ attrs += ("icalendarUid",)
+ elif workType == GroupCacherPollingWork:
+ attrs += ()
+ elif workType == IMIPPollingWork:
+ attrs += ()
+ elif workType == IMIPReplyWork:
+ attrs += ("organizer", "attendee")
+ else:
+ attrs = ()
+
+ if attrs:
+ if work is None:
+ self.log.error(
+ "workItem() returned None for job: {job}",
+ job=job
</ins><span class="cx"> )
</span><ins>+ # jobDict.update((attr, None) for attr in attrs)
+ for attr in attrs:
+ jobDict["work_{}".format(attr)] = None
+ else:
+ # jobDict.update(
+ # ("work_{}".format(attr), getattr(work, attr))
+ # for attr in attrs
+ # )
+ for attr in attrs:
+ jobDict["work_{}".format(attr)] = (
+ getattr(work, attr)
+ )
</ins><span class="cx">
</span><span class="cx"> jobDicts.append(jobDict)
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunkcalendarserverwebadminworkxhtml"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/webadmin/work.xhtml (12850 => 12851)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/webadmin/work.xhtml        2014-03-07 22:22:43 UTC (rev 12850)
+++ CalendarServer/trunk/calendarserver/webadmin/work.xhtml        2014-03-07 23:08:46 UTC (rev 12851)
</span><span class="lines">@@ -93,11 +93,17 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> var jobAttributeDescriptions = {
</span><del>- "jobID": "Job ID",
- "priority": "Job Priority",
- "notBefore": "Not Before",
- "notAfter": "Not After",
</del><ins>+ // Job management
+ "job_jobID": "Job ID",
+ "job_priority": "Job Priority",
+ "job_notBefore": "Not Before",
+ "job_notAfter": "Not After",
</ins><span class="cx">
</span><ins>+ // Work item management
+ "work_workID": "Work ID",
+ "work_notBefore": "Not Before (W)",
+ "work_group": "Work Group",
+
</ins><span class="cx"> // Push
</span><span class="cx"> "work_pushID": "Push ID",
</span><span class="cx"> "work_priority": "Priority",
</span></span></pre>
</div>
</div>
</body>
</html>