<!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>[14603] CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/caldav/datastore/scheduling/imip/inbound.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/14603">14603</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2015-03-17 11:39:37 -0700 (Tue, 17 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Don't let a missing PRODID prevent an IMIP reply</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesreleaseCalendarServer61devtxdavcaldavdatastoreschedulingimipinboundpy">CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/caldav/datastore/scheduling/imip/inbound.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesreleaseCalendarServer61devtxdavcaldavdatastoreschedulingimipinboundpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/caldav/datastore/scheduling/imip/inbound.py (14602 => 14603)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/caldav/datastore/scheduling/imip/inbound.py 2015-03-17 18:20:32 UTC (rev 14602)
+++ CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/caldav/datastore/scheduling/imip/inbound.py 2015-03-17 18:39:37 UTC (rev 14603)
</span><span class="lines">@@ -76,7 +76,10 @@
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def doWork(self):
</span><span class="cx"> calendar = Component.fromString(self.icalendarText)
</span><del>- yield injectMessage(self.transaction, self.organizer, self.attendee, calendar)
</del><ins>+ try:
+ yield injectMessage(self.transaction, self.organizer, self.attendee, calendar)
+ except:
+ log.error("Unable to process reply")
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -376,6 +379,14 @@
</span><span class="cx"> calendar = Component.fromString(calBody)
</span><span class="cx"> event = calendar.mainComponent()
</span><span class="cx">
</span><ins>+ # Don't let a missing PRODID prevent the reply from being processed
+ if not calendar.hasProperty("PRODID"):
+ calendar.addProperty(
+ Property(
+ "PRODID", "Unknown"
+ )
+ )
+
</ins><span class="cx"> calendar.removeAllButOneAttendee(attendee)
</span><span class="cx"> organizerProperty = calendar.getOrganizerProperty()
</span><span class="cx"> if organizerProperty is None:
</span><span class="lines">@@ -447,14 +458,14 @@
</span><span class="cx"> return succeed(self.INCOMPLETE_DSN)
</span><span class="cx">
</span><span class="cx"> log.info(
</span><del>- "Mail gateway received message %s from %s to %s" %
- (msg['Message-ID'], msg['From'], msg['To']))
</del><ins>+ "Mail gateway received message {msgid} from {fromAddr} to {toAddr}",
+ msgid=msg['Message-ID'], fromAddr=msg['From'], toAddr=msg['To'])
</ins><span class="cx">
</span><span class="cx"> return self.processReply(msg)
</span><span class="cx">
</span><span class="cx"> except Exception, e:
</span><span class="cx"> # Don't let a failure of any kind stop us
</span><del>- log.error("Failed to process message: %s" % (e,))
</del><ins>+ log.error("Failed to process message: {error}", error=str(e))
</ins><span class="cx"> return succeed(self.UNKNOWN_FAILURE)
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -465,9 +476,9 @@
</span><span class="cx"> try:
</span><span class="cx"> scheduler = IMIPScheduler(txn, None)
</span><span class="cx"> results = (yield scheduler.doSchedulingDirectly("iMIP", attendee, [organizer, ], calendar,))
</span><del>- log.info("Successfully injected iMIP response from %s to %s" % (attendee, organizer))
</del><ins>+ log.info("Successfully injected iMIP response from {attendee} to {organizer}", attendee=attendee, organizer=organizer)
</ins><span class="cx"> except Exception, e:
</span><del>- log.error("Failed to inject iMIP response (%s)" % (e,))
</del><ins>+ log.error("Failed to inject iMIP response ({error})", error=str(e))
</ins><span class="cx"> raise
</span><span class="cx">
</span><span class="cx"> returnValue(results)
</span></span></pre>
</div>
</div>
</body>
</html>