[CalendarServer-changes] [9798] CalendarServer/trunk/twistedcaldav/scheduling/imip.py

source_changes at macosforge.org source_changes at macosforge.org
Mon Sep 10 13:08:57 PDT 2012


Revision: 9798
          http://trac.macosforge.org/projects/calendarserver/changeset/9798
Author:   wsanchez at apple.com
Date:     2012-09-10 13:08:57 -0700 (Mon, 10 Sep 2012)
Log Message:
-----------
Log less.

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/scheduling/imip.py

Modified: CalendarServer/trunk/twistedcaldav/scheduling/imip.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/scheduling/imip.py	2012-09-10 19:41:27 UTC (rev 9797)
+++ CalendarServer/trunk/twistedcaldav/scheduling/imip.py	2012-09-10 20:08:57 UTC (rev 9798)
@@ -44,6 +44,7 @@
 
 log = Logger()
 
+
 class ScheduleViaIMip(DeliveryService):
     
     @classmethod
@@ -52,12 +53,23 @@
 
     @inlineCallbacks
     def generateSchedulingResponses(self):
+        def failForRecipient(recipient):
+            err = HTTPError(ErrorResponse(
+                responsecode.FORBIDDEN,
+                (caldav_namespace, "recipient-failed"),
+                "iMIP request failed",
+            ))
+            self.responses.add(
+                recipient.cuaddr,
+                Failure(exc_value=err),
+                reqstatus=iTIPRequestStatus.SERVICE_UNAVAILABLE
+            )
         
         # Generate an HTTP client request
         try:
             # We do not do freebusy requests via iMIP
             if self.freebusy:
-                raise ValueError("iMIP VFREEBUSY REQUESTs not supported.")
+                raise ValueError("iMIP VFREEBUSY requests not supported.")
 
             method = self.scheduler.calendar.propertyValue("METHOD") 
             if method not in (
@@ -97,17 +109,8 @@
         
                 except Exception, e:
                     # Generated failed response for this recipient
-                    log.err("Could not do server-to-imip request : %s %s" % (self, e))
-                    err = HTTPError(ErrorResponse(
-                        responsecode.FORBIDDEN,
-                        (caldav_namespace, "recipient-failed"),
-                        "iMIP request failed",
-                    ))
-                    self.responses.add(
-                        recipient.cuaddr,
-                        Failure(exc_value=err),
-                        reqstatus=iTIPRequestStatus.SERVICE_UNAVAILABLE
-                    )
+                    log.debug("iMIP request %s failed for recipient %s: %s" % (self, recipient, e))
+                    failForRecipient(recipient)
                 
                 else:
                     self.responses.add(
@@ -118,18 +121,9 @@
 
         except Exception, e:
             # Generated failed responses for each recipient
-            log.err("Could not do server-to-imip request : %s %s" % (self, e))
+            log.debug("iMIP request %s failed: %s" % (self, e))
             for recipient in self.recipients:
-                err = HTTPError(ErrorResponse(
-                    responsecode.FORBIDDEN,
-                    (caldav_namespace, "recipient-failed"),
-                    "iMIP request failed",
-                ))
-                self.responses.add(
-                    recipient.cuaddr,
-                    Failure(exc_value=err),
-                    reqstatus=iTIPRequestStatus.SERVICE_UNAVAILABLE
-                )
+                failForRecipient(recipient)
 
     def postToGateway(self, fromAddr, toAddr, caldata, reactor=None):
         if reactor is None:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120910/6782ca3d/attachment.html>


More information about the calendarserver-changes mailing list