<!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>[15553] 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/15553">15553</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2016-04-25 18:17:01 -0700 (Mon, 25 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Workers now post server alerts by sending them over AMP to the master, since elevated privileges are required.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcalendarservertapcaldavpy">CalendarServer/trunk/calendarserver/tap/caldav.py</a></li>
<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="CalendarServertrunkcalendarservertapcaldavpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tap/caldav.py (15552 => 15553)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tap/caldav.py 2016-04-25 22:07:02 UTC (rev 15552)
+++ CalendarServer/trunk/calendarserver/tap/caldav.py 2016-04-26 01:17:01 UTC (rev 15553)
</span><span class="lines">@@ -120,7 +120,7 @@
</span><span class="cx"> pgServiceFromConfig, getDBPool, MemoryLimitService,
</span><span class="cx"> storeFromConfig, getSSLPassphrase, preFlightChecks,
</span><span class="cx"> storeFromConfigWithDPSClient, storeFromConfigWithoutDPS,
</span><del>- serverRootLocation
</del><ins>+ serverRootLocation, AlertPoster
</ins><span class="cx"> )
</span><span class="cx"> try:
</span><span class="cx"> from calendarserver.version import version
</span><span class="lines">@@ -972,6 +972,9 @@
</span><span class="cx"> else:
</span><span class="cx"> groupCacher = None
</span><span class="cx">
</span><ins>+ # Allow worker to post alerts to master
+ AlertPoster.setupForWorker(controlSocketClient)
+
</ins><span class="cx"> def decorateTransaction(txn):
</span><span class="cx"> txn._pushDistributor = pushDistributor
</span><span class="cx"> txn._rootResource = result.rootResource
</span><span class="lines">@@ -1742,6 +1745,9 @@
</span><span class="cx"> controlSocket = ControlSocket()
</span><span class="cx"> controlSocket.addFactory(_LOG_ROUTE, logger)
</span><span class="cx">
</span><ins>+ # Allow master to receive alert posts from workers
+ AlertPoster.setupForMaster(controlSocket)
+
</ins><span class="cx"> # Optionally set up AMPPushMaster
</span><span class="cx"> if (
</span><span class="cx"> config.Notifications.Enabled and
</span></span></pre></div>
<a id="CalendarServertrunkcalendarservertaptesttest_utilpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tap/test/test_util.py (15552 => 15553)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tap/test/test_util.py 2016-04-25 22:07:02 UTC (rev 15552)
+++ CalendarServer/trunk/calendarserver/tap/test/test_util.py 2016-04-26 01:17:01 UTC (rev 15553)
</span><span class="lines">@@ -16,12 +16,15 @@
</span><span class="cx">
</span><span class="cx"> from calendarserver.tap.util import (
</span><span class="cx"> MemoryLimitService, Stepper, verifyTLSCertificate, memoryForPID,
</span><del>- secondsSinceLastPost, recordTimeStamp
</del><ins>+ AlertPoster, AMPAlertProtocol,
+ AMPAlertSender
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> from twisted.internet.defer import succeed, inlineCallbacks
</span><span class="cx"> from twisted.internet.task import Clock
</span><ins>+from twisted.protocols.amp import AMP
</ins><span class="cx"> from twisted.python.filepath import FilePath
</span><ins>+from twisted.test.testutils import returnConnected
</ins><span class="cx">
</span><span class="cx"> from twistedcaldav.config import ConfigDict
</span><span class="cx"> from twistedcaldav.test.util import TestCase
</span><span class="lines">@@ -311,21 +314,21 @@
</span><span class="cx">
</span><span class="cx"> # Non existent timestamp file
</span><span class="cx"> self.assertEquals(
</span><del>- secondsSinceLastPost("TestAlert", timestampsDirectory=timestampsDir, now=10),
</del><ins>+ AlertPoster.secondsSinceLastPost("TestAlert", timestampsDirectory=timestampsDir, now=10),
</ins><span class="cx"> 10
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> # Existing valid, past timestamp file
</span><del>- recordTimeStamp("TestAlert", timestampsDirectory=timestampsDir, now=5)
</del><ins>+ AlertPoster.recordTimeStamp("TestAlert", timestampsDirectory=timestampsDir, now=5)
</ins><span class="cx"> self.assertEquals(
</span><del>- secondsSinceLastPost("TestAlert", timestampsDirectory=timestampsDir, now=12),
</del><ins>+ AlertPoster.secondsSinceLastPost("TestAlert", timestampsDirectory=timestampsDir, now=12),
</ins><span class="cx"> 7
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> # Existing valid, future timestamp file
</span><del>- recordTimeStamp("TestAlert", timestampsDirectory=timestampsDir, now=20)
</del><ins>+ AlertPoster.recordTimeStamp("TestAlert", timestampsDirectory=timestampsDir, now=20)
</ins><span class="cx"> self.assertEquals(
</span><del>- secondsSinceLastPost("TestAlert", timestampsDirectory=timestampsDir, now=12),
</del><ins>+ AlertPoster.secondsSinceLastPost("TestAlert", timestampsDirectory=timestampsDir, now=12),
</ins><span class="cx"> -8
</span><span class="cx"> )
</span><span class="cx">
</span><span class="lines">@@ -334,6 +337,29 @@
</span><span class="cx"> child = dirFP.child(".TestAlert.timestamp")
</span><span class="cx"> child.setContent("not a number")
</span><span class="cx"> self.assertEquals(
</span><del>- secondsSinceLastPost("TestAlert", timestampsDirectory=timestampsDir, now=12),
</del><ins>+ AlertPoster.secondsSinceLastPost("TestAlert", timestampsDirectory=timestampsDir, now=12),
</ins><span class="cx"> 12
</span><span class="cx"> )
</span><ins>+
+
+ def stubPostAlert(self, alertType, ignoreWithinSeconds, args):
+ self.alertType = alertType
+ self.ignoreWithinSeconds = ignoreWithinSeconds
+ self.args = args
+
+
+ def test_protocol(self):
+ self.patch(AlertPoster, "postAlert", self.stubPostAlert)
+ AlertPoster.setupForTest()
+
+ client = AMP()
+ server = AMPAlertProtocol()
+ pump = returnConnected(server, client)
+
+ sender = AMPAlertSender(protocol=client)
+ sender.sendAlert("alertType", ["arg1", "arg2"])
+ pump.flush()
+
+ self.assertEquals(self.alertType, "alertType")
+ self.assertEquals(self.ignoreWithinSeconds, 0)
+ self.assertEquals(self.args, ["arg1", "arg2"])
</ins></span></pre></div>
<a id="CalendarServertrunkcalendarservertaputilpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tap/util.py (15552 => 15553)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tap/util.py 2016-04-25 22:07:02 UTC (rev 15552)
+++ CalendarServer/trunk/calendarserver/tap/util.py 2016-04-26 01:17:01 UTC (rev 15553)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx"> "getRootResource",
</span><span class="cx"> "getSSLPassphrase",
</span><span class="cx"> "MemoryLimitService",
</span><del>- "postAlert",
</del><ins>+ "AlertPoster",
</ins><span class="cx"> "preFlightChecks",
</span><span class="cx"> ]
</span><span class="cx">
</span><span class="lines">@@ -59,7 +59,9 @@
</span><span class="cx"> from twisted.internet import reactor as _reactor
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks, returnValue, Deferred, succeed
</span><span class="cx"> from twisted.internet.reactor import addSystemEventTrigger
</span><ins>+from twisted.internet.protocol import Factory
</ins><span class="cx"> from twisted.internet.tcp import Connection
</span><ins>+from twisted.protocols import amp
</ins><span class="cx"> from twisted.python.usage import UsageError
</span><span class="cx">
</span><span class="cx"> from twistedcaldav.bind import doBind
</span><span class="lines">@@ -1320,7 +1322,7 @@
</span><span class="cx"> cert=config.SSLCertificate
</span><span class="cx"> )
</span><span class="cx"> )
</span><del>- postAlert("MissingCertificateAlert", 0, ["path", config.SSLCertificate])
</del><ins>+ AlertPoster.getAlertPoster().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">@@ -1385,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>- postAlert("PushNotificationCertificateAlert", 0, [])
</del><ins>+ AlertPoster.getAlertPoster().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">@@ -1420,7 +1422,7 @@
</span><span class="cx"> reason=str(e)
</span><span class="cx"> )
</span><span class="cx"> )
</span><del>- postAlert("PushNotificationCertificateAlert", 0, [])
</del><ins>+ AlertPoster.getAlertPoster().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">@@ -1497,68 +1499,210 @@
</span><span class="cx"> return None
</span><span class="cx">
</span><span class="cx">
</span><ins>+#
+# Server Alert Posting
+#
</ins><span class="cx">
</span><del>-def secondsSinceLastPost(alertType, timestampsDirectory=None, now=None):
- if timestampsDirectory is None:
- timestampsDirectory = config.DataRoot
- if now is None:
- now = int(time.time())
</del><ins>+class AlertPoster(object):
+ """
+ Encapsulates the posting of server alerts via a singleton which can be
+ configured differently depending on whether you want to directly spawn
+ the external alert program from this process, or send an AMP request to
+ another process to spawn. Workers should call setupForWorker( ), and
+ then calls to postAlert( ) will send an AMP message to the master. The
+ master should call setupForMaster( ), and then calls to postAlert( )
+ within the master will spawn the external alert program.
+ """
</ins><span class="cx">
</span><del>- dirFP = FilePath(timestampsDirectory)
- childFP = dirFP.child(".{}.timestamp".format(alertType))
- if not childFP.exists():
- timestamp = 0
- else:
- with childFP.open() as child:
- try:
- line = child.readline().strip()
- timestamp = int(line)
- except:
- timestamp = 0
- return now - timestamp
</del><ins>+ # Control socket message-routing constants
+ ALERT_ROUTE = "alert"
</ins><span class="cx">
</span><ins>+ _alertPoster = None
</ins><span class="cx">
</span><span class="cx">
</span><del>-def recordTimeStamp(alertType, timestampsDirectory=None, now=None):
- if timestampsDirectory is None:
- timestampsDirectory = config.DataRoot
- if now is None:
- now = int(time.time())
</del><ins>+ @classmethod
+ def setupForMaster(cls, controlSocket):
+ cls._alertPoster = cls()
+ AMPAlertReceiver(controlSocket)
</ins><span class="cx">
</span><del>- dirFP = FilePath(timestampsDirectory)
- childFP = dirFP.child(".{}.timestamp".format(alertType))
- childFP.setContent(str(now))
</del><span class="cx">
</span><ins>+ @classmethod
+ def setupForWorker(cls, controlSocket):
+ cls._alertPoster = cls(controlSocket)
</ins><span class="cx">
</span><span class="cx">
</span><del>-def postAlert(alertType, ignoreWithinSeconds, args):
- if (
- config.AlertPostingProgram and
- os.path.exists(config.AlertPostingProgram)
- ):
</del><ins>+ @classmethod
+ def setupForTest(cls):
+ cls._alertPoster = cls()
+
+
+ @classmethod
+ def getAlertPoster(cls):
+ return cls._alertPoster
+
+
+ def __init__(self, controlSocket=None):
+
+ if controlSocket is None:
+ self.sender = None
+ else:
+ self.sender = AMPAlertSender(controlSocket)
+
+
+ def postAlert(self, alertType, ignoreWithinSeconds, args):
+
+ if not config.AlertPostingProgram:
+ return
+
+ if not os.path.exists(config.AlertPostingProgram):
+ return
+
</ins><span class="cx"> if ignoreWithinSeconds:
</span><del>- seconds = secondsSinceLastPost(alertType)
</del><ins>+ seconds = self.secondsSinceLastPost(alertType)
</ins><span class="cx"> if seconds < ignoreWithinSeconds:
</span><span class="cx"> return
</span><span class="cx">
</span><del>- recordTimeStamp(alertType)
</del><ins>+ if self.sender is None:
+ # Just do it
</ins><span class="cx">
</span><del>- try:
- commandLine = [config.AlertPostingProgram, alertType]
- commandLine.extend(args)
- Popen(
- commandLine,
- stdout=PIPE,
- stderr=PIPE,
- ).communicate()
- except Exception, e:
- log.error(
- "Could not post alert: {alertType} {args} ({error})",
- alertType=alertType, args=args, error=e
</del><ins>+ self.recordTimeStamp(alertType)
+
+ try:
+ commandLine = [config.AlertPostingProgram, alertType]
+ commandLine.extend(args)
+ Popen(
+ commandLine,
+ stdout=PIPE,
+ stderr=PIPE,
+ ).communicate()
+ except Exception, e:
+ log.error(
+ "Could not post alert: {alertType} {args} ({error})",
+ alertType=alertType, args=args, error=e
+ )
+
+ else:
+ # Send request to master over AMP
+ self.sender.sendAlert(alertType, args)
+
+
+
+ @classmethod
+ def secondsSinceLastPost(cls, alertType, timestampsDirectory=None, now=None):
+ if timestampsDirectory is None:
+ timestampsDirectory = config.DataRoot
+ if now is None:
+ now = int(time.time())
+
+ dirFP = FilePath(timestampsDirectory)
+ childFP = dirFP.child(".{}.timestamp".format(alertType))
+ if not childFP.exists():
+ timestamp = 0
+ else:
+ with childFP.open() as child:
+ try:
+ line = child.readline().strip()
+ timestamp = int(line)
+ except:
+ timestamp = 0
+ return now - timestamp
+
+
+
+ @classmethod
+ def recordTimeStamp(cls, alertType, timestampsDirectory=None, now=None):
+ if timestampsDirectory is None:
+ timestampsDirectory = config.DataRoot
+ if now is None:
+ now = int(time.time())
+
+ dirFP = FilePath(timestampsDirectory)
+ childFP = dirFP.child(".{}.timestamp".format(alertType))
+ childFP.setContent(str(now))
+
+
+
+
+class AMPAlertSendingFactory(Factory):
+
+ def __init__(self, sender):
+ self.sender = sender
+
+ def buildProtocol(self, addr):
+ protocol = amp.AMP()
+ self.sender.protocol = protocol
+ return protocol
+
+
+
+class AMPAlertSender(object):
+ """
+ Runs in the workers, sends alerts to the master via AMP
+ """
+
+ def __init__(self, controlSocket=None, protocol=None):
+ self.protocol = protocol
+ if controlSocket is not None:
+ controlSocket.addFactory(AlertPoster.ALERT_ROUTE, AMPAlertSendingFactory(self))
+
+
+ def sendAlert(self, alertType, args):
+ return self.protocol.callRemote(
+ PostAlert, alertType=alertType, args=args
+ )
+
+
+
+class AMPAlertReceiverFactory(Factory):
+
+ def buildProtocol(self, addr):
+ return AMPAlertProtocol()
+
+
+
+class AMPAlertReceiver(object):
+ """
+ Runs in the master, receives alerts from workers, executes the alert posting program
+ """
+
+ def __init__(self, controlSocket):
+ if controlSocket is not None:
+ # Set up the listener which gets alerts from the slaves
+ controlSocket.addFactory(
+ AlertPoster.ALERT_ROUTE, AMPAlertReceiverFactory()
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><ins>+class PostAlert(amp.Command):
+ arguments = [
+ ('alertType', amp.String()),
+ ('args', amp.ListOf(amp.String())),
+ ]
+ response = [
+ ('status', amp.String()),
+ ]
+
+
+
+
+class AMPAlertProtocol(amp.AMP):
+ """
+ Defines the AMP protocol for sending alerts from worker to master
+ """
+
+ @PostAlert.responder
+ def postAlert(self, alertType, args):
+ """
+ The "PostAlert" handler in the master
+ """
+ AlertPoster.getAlertPoster().postAlert(alertType, 0, args)
+ return {
+ "status": "OK"
+ }
+
+
+
</ins><span class="cx"> def serverRootLocation():
</span><span class="cx"> """
</span><span class="cx"> Return the ServerRoot value from the OS X preferences plist. If plist not
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoreschedulingimipinboundpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/inbound.py (15552 => 15553)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/inbound.py 2016-04-25 22:07:02 UTC (rev 15552)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/inbound.py 2016-04-26 01:17:01 UTC (rev 15553)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> import email.utils
</span><span class="cx">
</span><span class="cx"> from OpenSSL.SSL import Error as TLSError
</span><del>-from calendarserver.tap.util import postAlert
</del><ins>+from calendarserver.tap.util import AlertPoster
</ins><span class="cx">
</span><span class="cx"> log = Logger()
</span><span class="cx">
</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>- postAlert("MailCertificateAlert", 7 * 24 * 60 * 60, [])
</del><ins>+ AlertPoster.getAlertPoster().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 (15552 => 15553)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/smtpsender.py 2016-04-25 22:07:02 UTC (rev 15552)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/smtpsender.py 2016-04-26 01:17:01 UTC (rev 15553)
</span><span class="lines">@@ -61,8 +61,8 @@
</span><span class="cx"> )
</span><span class="cx"> from OpenSSL.SSL import Error as TLSError
</span><span class="cx"> if failure.type is TLSError:
</span><del>- from calendarserver.tap.util import postAlert
- postAlert("MailCertificateAlert", 7 * 24 * 60 * 60, [])
</del><ins>+ from calendarserver.tap.util import AlertPoster
+ AlertPoster.getAlertPoster().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>