[CalendarServer-changes] [14542] CalendarServer/trunk/txdav/common/datastore/podding/conduit.py

[source_changes at macosforge.org]

Revision: 14542
          http://trac.calendarserver.org//changeset/14542
Author:   wsanchez at apple.com
Date:     2015-03-09 17:26:26 -0700 (Mon, 09 Mar 2015)
Log Message:
-----------
ex->error; logging in API, use useful symbol names.

Modified Paths:
--------------
    CalendarServer/trunk/txdav/common/datastore/podding/conduit.py

Modified: CalendarServer/trunk/txdav/common/datastore/podding/conduit.py
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/podding/conduit.py	2015-03-10 00:25:39 UTC (rev 14541)
+++ CalendarServer/trunk/txdav/common/datastore/podding/conduit.py	2015-03-10 00:26:26 UTC (rev 14542)
@@ -265,8 +265,8 @@
         except (KeyError, TypeError) as e:
             log.error(
                 "JSON data must have an object as its root with an "
-                "'action' attribute: {ex}\n{json}",
-                ex=e, json=data
+                "'action' attribute: {error}\n{json}",
+                error=e, json=data
             )
             raise FailedCrossPodRequestError(
                 "JSON data must have an object as its root with an "
@@ -289,7 +289,9 @@
         except Exception as e:
             # Send the exception over to the other side
             yield txn.abort()
-            log.error("Failed action: {action}, {ex}", action=action, ex=e)
+            log.error(
+                "Failed action: {action}, {error}", action=action, error=e
+            )
             result = {
                 "result": "exception",
                 "class": ".".join((
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150309/35beabba/attachment.html>