[CalendarServer-changes] [10995] CalendarServer/trunk/twistedcaldav/scheduling/caldav/delivery.py

[source_changes at macosforge.org]

Revision: 10995
          http://trac.calendarserver.org//changeset/10995
Author:   cdaboo at apple.com
Date:     2013-04-03 13:55:42 -0700 (Wed, 03 Apr 2013)
Log Message:
-----------
Only generate traceback when debug logging actually on.

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/scheduling/caldav/delivery.py

Modified: CalendarServer/trunk/twistedcaldav/scheduling/caldav/delivery.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/scheduling/caldav/delivery.py	2013-04-03 20:38:22 UTC (rev 10994)
+++ CalendarServer/trunk/twistedcaldav/scheduling/caldav/delivery.py	2013-04-03 20:55:42 UTC (rev 10995)
@@ -114,7 +114,8 @@
                     yield recipient.inbox.checkPrivileges(self.scheduler.request, (caldavxml.ScheduleDeliver(),), principal=organizerPrincipal)
                 except AccessDeniedError:
                     log.err("Could not access Inbox for recipient: %s" % (recipient.cuaddr,))
-                    log.debug("Bare Exception: %s" % (Failure().getTraceback(),))
+                    if log.willLogAtLevel("debug"):
+                        log.debug("Bare Exception: %s" % (Failure().getTraceback(),))
                     err = HTTPError(ErrorResponse(
                         responsecode.NOT_FOUND,
                         (caldav_namespace, "recipient-permissions"),
@@ -165,7 +166,8 @@
             ))
         except ImplicitProcessorException, e:
             log.err("Could not store data in Inbox : %s" % (recipient.inbox,))
-            log.debug("%s: %s" % (e, Failure().getTraceback(),))
+            if log.willLogAtLevel("debug"):
+                log.debug("%s: %s" % (e, Failure().getTraceback(),))
             err = HTTPError(ErrorResponse(
                 responsecode.FORBIDDEN,
                 (caldav_namespace, "recipient-permissions"),
@@ -191,7 +193,8 @@
             except:
                 # FIXME: Bare except
                 log.err("Could not store data in Inbox : %s" % (recipient.inbox,))
-                log.debug("Bare Exception: %s" % (Failure().getTraceback(),))
+                if log.willLogAtLevel("debug"):
+                    log.debug("Bare Exception: %s" % (Failure().getTraceback(),))
                 err = HTTPError(ErrorResponse(
                     responsecode.FORBIDDEN,
                     (caldav_namespace, "recipient-permissions"),
@@ -233,7 +236,8 @@
             ))
         except:
             log.err("Could not determine free busy information: %s" % (recipient.cuaddr,))
-            log.debug("Bare Exception: %s" % (Failure().getTraceback(),))
+            if log.willLogAtLevel("debug"):
+                log.debug("Bare Exception: %s" % (Failure().getTraceback(),))
             err = HTTPError(ErrorResponse(
                 responsecode.FORBIDDEN,
                 (caldav_namespace, "recipient-permissions"),
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130403/5d33408a/attachment-0001.html>