<!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>[14710] CalendarServer/branches/release/CalendarServer-5.4-dev</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/14710">14710</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-04-24 13:56:47 -0700 (Fri, 24 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix purge events logging.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesreleaseCalendarServer54devcalendarservertoolspurgepy">CalendarServer/branches/release/CalendarServer-5.4-dev/calendarserver/tools/purge.py</a></li>
<li><a href="#CalendarServerbranchesreleaseCalendarServer54devcalendarservertoolstesttest_purge_old_eventspy">CalendarServer/branches/release/CalendarServer-5.4-dev/calendarserver/tools/test/test_purge_old_events.py</a></li>
<li><a href="#CalendarServerbranchesreleaseCalendarServer54devtwextpythonlogpy">CalendarServer/branches/release/CalendarServer-5.4-dev/twext/python/log.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesreleaseCalendarServer54devcalendarservertoolspurgepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/release/CalendarServer-5.4-dev/calendarserver/tools/purge.py (14709 => 14710)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/release/CalendarServer-5.4-dev/calendarserver/tools/purge.py 2015-04-24 19:29:05 UTC (rev 14709)
+++ CalendarServer/branches/release/CalendarServer-5.4-dev/calendarserver/tools/purge.py 2015-04-24 20:56:47 UTC (rev 14710)
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx"> cutoff = None
</span><span class="cx"> batchSize = None
</span><span class="cx"> dryrun = False
</span><del>- verbose = False
</del><ins>+ debug = False
</ins><span class="cx">
</span><span class="cx"> @classmethod
</span><span class="cx"> def usage(cls, e=None):
</span><span class="lines">@@ -167,25 +167,25 @@
</span><span class="cx"> cls.cutoff = cutoff
</span><span class="cx"> cls.batchSize = batchSize
</span><span class="cx"> cls.dryrun = dryrun
</span><del>- cls.verbose = verbose
</del><ins>+ cls.debug = debug
</ins><span class="cx">
</span><span class="cx"> utilityMain(
</span><span class="cx"> configFileName,
</span><span class="cx"> cls,
</span><del>- verbose=debug,
</del><ins>+ verbose=verbose,
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> @classmethod
</span><span class="cx"> @inlineCallbacks
</span><del>- def purgeOldEvents(cls, store, uuid, cutoff, batchSize, verbose=False, dryrun=False):
</del><ins>+ def purgeOldEvents(cls, store, uuid, cutoff, batchSize, debug=False, dryrun=False):
</ins><span class="cx">
</span><span class="cx"> service = cls(store)
</span><span class="cx"> service.uuid = uuid
</span><span class="cx"> service.cutoff = cutoff
</span><span class="cx"> service.batchSize = batchSize
</span><span class="cx"> service.dryrun = dryrun
</span><del>- service.verbose = verbose
</del><ins>+ service.debug = debug
</ins><span class="cx"> result = (yield service.doWork())
</span><span class="cx"> returnValue(result)
</span><span class="cx">
</span><span class="lines">@@ -195,7 +195,7 @@
</span><span class="cx"> """
</span><span class="cx"> Find all the calendar homes that match the uuid cli argument.
</span><span class="cx"> """
</span><del>- log.debug("Searching for calendar homes matching: {}".format(self.uuid))
</del><ins>+ log.debug("Searching for calendar homes matching: '{}'".format(self.uuid))
</ins><span class="cx"> txn = self.store.newTransaction(label="Find matching homes")
</span><span class="cx"> ch = schema.CALENDAR_HOME
</span><span class="cx"> if self.uuid:
</span><span class="lines">@@ -226,7 +226,7 @@
</span><span class="cx"> @param owner_uid: owner UUID of home to check
</span><span class="cx"> @type owner_uid: L{str}
</span><span class="cx"> """
</span><del>- log.debug("Checking calendar home: {} {}".format(home_id, owner_uid))
</del><ins>+ log.debug("Checking calendar home: {} '{}'".format(home_id, owner_uid))
</ins><span class="cx"> txn = self.store.newTransaction(label="Find matching calendars")
</span><span class="cx"> cb = schema.CALENDAR_BIND
</span><span class="cx"> kwds = {"home_id": home_id}
</span><span class="lines">@@ -258,7 +258,7 @@
</span><span class="cx"> @type calendar_name: L{str}
</span><span class="cx"> """
</span><span class="cx">
</span><del>- log.debug(" Checking calendar: {} {}".format(calendar_id, calendar_name))
</del><ins>+ log.debug(" Checking calendar: {} '{}'".format(calendar_id, calendar_name))
</ins><span class="cx"> purge = set()
</span><span class="cx"> txn = self.store.newTransaction(label="Find matching resources")
</span><span class="cx"> co = schema.CALENDAR_OBJECT
</span><span class="lines">@@ -414,6 +414,13 @@
</span><span class="cx"> last_calendar = event.calendar
</span><span class="cx"> resource = (yield calendar.objectResourceWithID(event.resource))
</span><span class="cx"> yield resource.remove(implicitly=False)
</span><ins>+ log.debug("Removed resource {} '{}' from calendar {} '{}' of calendar home '{}'".format(
+ resource.id(),
+ resource.name(),
+ resource.parentCollection().id(),
+ resource.parentCollection().name(),
+ resource.parentCollection().ownerHome().uid()
+ ))
</ins><span class="cx"> count += 1
</span><span class="cx"> yield txn.commit()
</span><span class="cx"> returnValue(count)
</span><span class="lines">@@ -422,7 +429,7 @@
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def doWork(self):
</span><span class="cx">
</span><del>- if self.verbose:
</del><ins>+ if self.debug:
</ins><span class="cx"> # Turn on debug logging for this module
</span><span class="cx"> config.LogLevels[__name__] = "debug"
</span><span class="cx"> else:
</span></span></pre></div>
<a id="CalendarServerbranchesreleaseCalendarServer54devcalendarservertoolstesttest_purge_old_eventspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/release/CalendarServer-5.4-dev/calendarserver/tools/test/test_purge_old_events.py (14709 => 14710)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/release/CalendarServer-5.4-dev/calendarserver/tools/test/test_purge_old_events.py 2015-04-24 19:29:05 UTC (rev 14709)
+++ CalendarServer/branches/release/CalendarServer-5.4-dev/calendarserver/tools/test/test_purge_old_events.py 2015-04-24 20:56:47 UTC (rev 14710)
</span><span class="lines">@@ -640,7 +640,7 @@
</span><span class="cx"> PyCalendarDateTime(now, 4, 1, 0, 0, 0),
</span><span class="cx"> 2,
</span><span class="cx"> dryrun=True,
</span><del>- verbose=True
</del><ins>+ debug=True
</ins><span class="cx"> ))
</span><span class="cx"> self.assertEquals(total, 13)
</span><span class="cx">
</span><span class="lines">@@ -650,7 +650,7 @@
</span><span class="cx"> None,
</span><span class="cx"> PyCalendarDateTime(now, 4, 1, 0, 0, 0),
</span><span class="cx"> 2,
</span><del>- verbose=False
</del><ins>+ debug=False
</ins><span class="cx"> ))
</span><span class="cx"> self.assertEquals(total, 13)
</span><span class="cx">
</span><span class="lines">@@ -660,7 +660,7 @@
</span><span class="cx"> None,
</span><span class="cx"> PyCalendarDateTime(now, 4, 1, 0, 0, 0),
</span><span class="cx"> 2,
</span><del>- verbose=False
</del><ins>+ debug=False
</ins><span class="cx"> ))
</span><span class="cx"> self.assertEquals(total, 0)
</span><span class="cx">
</span><span class="lines">@@ -675,7 +675,7 @@
</span><span class="cx"> PyCalendarDateTime(now, 4, 1, 0, 0, 0),
</span><span class="cx"> 2,
</span><span class="cx"> dryrun=True,
</span><del>- verbose=True
</del><ins>+ debug=True
</ins><span class="cx"> ))
</span><span class="cx"> self.assertEquals(total, 13)
</span><span class="cx">
</span><span class="lines">@@ -686,7 +686,7 @@
</span><span class="cx"> PyCalendarDateTime(now, 4, 1, 0, 0, 0),
</span><span class="cx"> 2,
</span><span class="cx"> dryrun=True,
</span><del>- verbose=True
</del><ins>+ debug=True
</ins><span class="cx"> ))
</span><span class="cx"> self.assertEquals(total, 13)
</span><span class="cx">
</span><span class="lines">@@ -697,7 +697,7 @@
</span><span class="cx"> PyCalendarDateTime(now, 4, 1, 0, 0, 0),
</span><span class="cx"> 2,
</span><span class="cx"> dryrun=True,
</span><del>- verbose=True
</del><ins>+ debug=True
</ins><span class="cx"> ))
</span><span class="cx"> self.assertEquals(total, 5)
</span><span class="cx">
</span><span class="lines">@@ -708,7 +708,7 @@
</span><span class="cx"> PyCalendarDateTime(now, 4, 1, 0, 0, 0),
</span><span class="cx"> 2,
</span><span class="cx"> dryrun=True,
</span><del>- verbose=True
</del><ins>+ debug=True
</ins><span class="cx"> ))
</span><span class="cx"> self.assertEquals(total, 8)
</span><span class="cx">
</span><span class="lines">@@ -727,7 +727,7 @@
</span><span class="cx"> cutoff,
</span><span class="cx"> 2,
</span><span class="cx"> dryrun=True,
</span><del>- verbose=True
</del><ins>+ debug=True
</ins><span class="cx"> ))
</span><span class="cx"> self.assertEquals(total, 12)
</span><span class="cx">
</span><span class="lines">@@ -737,7 +737,7 @@
</span><span class="cx"> None,
</span><span class="cx"> cutoff,
</span><span class="cx"> 2,
</span><del>- verbose=True
</del><ins>+ debug=True
</ins><span class="cx"> ))
</span><span class="cx"> self.assertEquals(total, 12)
</span><span class="cx">
</span><span class="lines">@@ -747,7 +747,7 @@
</span><span class="cx"> cutoff,
</span><span class="cx"> 2,
</span><span class="cx"> dryrun=True,
</span><del>- verbose=True
</del><ins>+ debug=True
</ins><span class="cx"> ))
</span><span class="cx"> self.assertEquals(total, 0)
</span><span class="cx">
</span><span class="lines">@@ -872,7 +872,7 @@
</span><span class="cx"> None,
</span><span class="cx"> PyCalendarDateTime(now, 4, 1, 0, 0, 0),
</span><span class="cx"> 2,
</span><del>- verbose=False
</del><ins>+ debug=False
</ins><span class="cx"> ))
</span><span class="cx"> self.assertEquals(total, 13)
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServerbranchesreleaseCalendarServer54devtwextpythonlogpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/release/CalendarServer-5.4-dev/twext/python/log.py (14709 => 14710)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/release/CalendarServer-5.4-dev/twext/python/log.py 2015-04-24 19:29:05 UTC (rev 14709)
+++ CalendarServer/branches/release/CalendarServer-5.4-dev/twext/python/log.py 2015-04-24 20:56:47 UTC (rev 14710)
</span><span class="lines">@@ -970,7 +970,7 @@
</span><span class="cx"> output = stdout
</span><span class="cx">
</span><span class="cx"> if not text:
</span><del>- text = " ".join([str(m) for m in eventDict["message"]]) + "\n"
</del><ins>+ text = formatEvent(eventDict) + "\n"
</ins><span class="cx">
</span><span class="cx"> output.write(text)
</span><span class="cx"> output.flush()
</span></span></pre>
</div>
</div>
</body>
</html>