<!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>[15562] 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/15562">15562</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2016-04-28 11:30:45 -0700 (Thu, 28 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>AlertPoster now has a sensible default, and a simpler API, with no need to getAlertPoster()</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcalendarservertaptesttest_utilpy">CalendarServer/trunk/calendarserver/tap/test/test_util.py</a></li>
<li><a href="#CalendarServertrunkcalendarservertaputilpy">CalendarServer/trunk/calendarserver/tap/util.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoreschedulingimipinboundpy">CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/inbound.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoreschedulingimipsmtpsenderpy">CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/smtpsender.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkcalendarservertaptesttest_utilpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tap/test/test_util.py (15561 => 15562)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tap/test/test_util.py 2016-04-28 17:26:17 UTC (rev 15561)
+++ CalendarServer/trunk/calendarserver/tap/test/test_util.py 2016-04-28 18:30:45 UTC (rev 15562)
</span><span class="lines">@@ -350,7 +350,6 @@
</span><span class="cx">
</span><span class="cx"> def test_protocol(self):
</span><span class="cx"> self.patch(AlertPoster, "postAlert", self.stubPostAlert)
</span><del>- AlertPoster.setupForTest()
</del><span class="cx">
</span><span class="cx"> client = AMP()
</span><span class="cx"> server = AMPAlertProtocol()
</span></span></pre></div>
<a id="CalendarServertrunkcalendarservertaputilpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tap/util.py (15561 => 15562)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tap/util.py 2016-04-28 17:26:17 UTC (rev 15561)
+++ CalendarServer/trunk/calendarserver/tap/util.py 2016-04-28 18:30:45 UTC (rev 15562)
</span><span class="lines">@@ -1322,7 +1322,7 @@
</span><span class="cx"> cert=config.SSLCertificate
</span><span class="cx"> )
</span><span class="cx"> )
</span><del>- AlertPoster.getAlertPoster().postAlert("MissingCertificateAlert", 0, ["path", config.SSLCertificate])
</del><ins>+ AlertPoster.postAlert("MissingCertificateAlert", 0, ["path", config.SSLCertificate])
</ins><span class="cx"> return False, message
</span><span class="cx">
</span><span class="cx"> length = os.stat(config.SSLCertificate).st_size
</span><span class="lines">@@ -1387,7 +1387,7 @@
</span><span class="cx"> try:
</span><span class="cx"> getAPNTopicFromConfig(protocol, accountName, protoConfig)
</span><span class="cx"> except ValueError as e:
</span><del>- AlertPoster.getAlertPoster().postAlert("PushNotificationCertificateAlert", 0, [])
</del><ins>+ AlertPoster.postAlert("PushNotificationCertificateAlert", 0, [])
</ins><span class="cx"> return False, str(e)
</span><span class="cx">
</span><span class="cx"> # Let OpenSSL try to use the cert
</span><span class="lines">@@ -1422,7 +1422,7 @@
</span><span class="cx"> reason=str(e)
</span><span class="cx"> )
</span><span class="cx"> )
</span><del>- AlertPoster.getAlertPoster().postAlert("PushNotificationCertificateAlert", 0, [])
</del><ins>+ AlertPoster.postAlert("PushNotificationCertificateAlert", 0, [])
</ins><span class="cx"> return False, message
</span><span class="cx">
</span><span class="cx"> return True, "APNS enabled"
</span><span class="lines">@@ -1533,12 +1533,9 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> @classmethod
</span><del>- def setupForTest(cls):
- cls._alertPoster = cls()
-
-
- @classmethod
- def getAlertPoster(cls):
</del><ins>+ def _getAlertPoster(cls):
+ if cls._alertPoster is None:
+ cls._alertPoster = cls()
</ins><span class="cx"> return cls._alertPoster
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -1550,8 +1547,11 @@
</span><span class="cx"> self.sender = AMPAlertSender(controlSocket)
</span><span class="cx">
</span><span class="cx">
</span><del>- def postAlert(self, alertType, ignoreWithinSeconds, args):
</del><ins>+ @classmethod
+ def postAlert(cls, alertType, ignoreWithinSeconds, args):
</ins><span class="cx">
</span><ins>+ poster = cls._getAlertPoster()
+
</ins><span class="cx"> if not config.AlertPostingProgram:
</span><span class="cx"> return
</span><span class="cx">
</span><span class="lines">@@ -1559,14 +1559,14 @@
</span><span class="cx"> return
</span><span class="cx">
</span><span class="cx"> if ignoreWithinSeconds:
</span><del>- seconds = self.secondsSinceLastPost(alertType)
</del><ins>+ seconds = cls.secondsSinceLastPost(alertType)
</ins><span class="cx"> if seconds < ignoreWithinSeconds:
</span><span class="cx"> return
</span><span class="cx">
</span><del>- if self.sender is None:
</del><ins>+ if poster.sender is None:
</ins><span class="cx"> # Just do it
</span><span class="cx">
</span><del>- self.recordTimeStamp(alertType)
</del><ins>+ cls.recordTimeStamp(alertType)
</ins><span class="cx">
</span><span class="cx"> try:
</span><span class="cx"> commandLine = [config.AlertPostingProgram, alertType]
</span><span class="lines">@@ -1584,7 +1584,7 @@
</span><span class="cx">
</span><span class="cx"> else:
</span><span class="cx"> # Send request to master over AMP
</span><del>- self.sender.sendAlert(alertType, args)
</del><ins>+ poster.sender.sendAlert(alertType, args)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> @classmethod
</span><span class="lines">@@ -1694,7 +1694,7 @@
</span><span class="cx"> """
</span><span class="cx"> The "PostAlert" handler in the master
</span><span class="cx"> """
</span><del>- AlertPoster.getAlertPoster().postAlert(alertType, 0, args)
</del><ins>+ AlertPoster.postAlert(alertType, 0, args)
</ins><span class="cx"> return {
</span><span class="cx"> "status": "OK"
</span><span class="cx"> }
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoreschedulingimipinboundpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/inbound.py (15561 => 15562)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/inbound.py 2016-04-28 17:26:17 UTC (rev 15561)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/inbound.py 2016-04-28 18:30:45 UTC (rev 15562)
</span><span class="lines">@@ -640,7 +640,7 @@
</span><span class="cx">
</span><span class="cx"> def connectionLost(self, reason):
</span><span class="cx"> if reason.type is TLSError:
</span><del>- AlertPoster.getAlertPoster().postAlert("MailCertificateAlert", 7 * 24 * 60 * 60, [])
</del><ins>+ AlertPoster.postAlert("MailCertificateAlert", 7 * 24 * 60 * 60, [])
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def serverGreeting(self, capabilities):
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoreschedulingimipsmtpsenderpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/smtpsender.py (15561 => 15562)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/smtpsender.py 2016-04-28 17:26:17 UTC (rev 15561)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/smtpsender.py 2016-04-28 18:30:45 UTC (rev 15562)
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> from OpenSSL.SSL import Error as TLSError
</span><span class="cx"> if failure.type is TLSError:
</span><span class="cx"> from calendarserver.tap.util import AlertPoster
</span><del>- AlertPoster.getAlertPoster().postAlert("MailCertificateAlert", 7 * 24 * 60 * 60, [])
</del><ins>+ AlertPoster.postAlert("MailCertificateAlert", 7 * 24 * 60 * 60, [])
</ins><span class="cx"> return False
</span><span class="cx">
</span><span class="cx"> deferred = defer.Deferred()
</span></span></pre>
</div>
</div>
</body>
</html>