[CalendarServer-changes] [11509] CalendarServer/trunk/calendarserver/platform/darwin/od/ opendirectory.py

[source_changes at macosforge.org]

Revision: 11509
          http://trac.calendarserver.org//changeset/11509
Author:   sagen at apple.com
Date:     2013-07-12 16:47:07 -0700 (Fri, 12 Jul 2013)
Log Message:
-----------
Update logging calls

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/platform/darwin/od/opendirectory.py

Modified: CalendarServer/trunk/calendarserver/platform/darwin/od/opendirectory.py
===================================================================
--- CalendarServer/trunk/calendarserver/platform/darwin/od/opendirectory.py	2013-07-12 21:49:32 UTC (rev 11508)
+++ CalendarServer/trunk/calendarserver/platform/darwin/od/opendirectory.py	2013-07-12 23:47:07 UTC (rev 11509)
@@ -172,7 +172,7 @@
             return Directory(session, node, nodeName)
 
         code = error.code()
-        log.debug("Received code %d from node call: %s" % (code, error))
+        log.debug("Received code {code} from node call: {err}", code=code, err=error)
 
         if code in RETRY_CODES:
             tries -= 1
@@ -205,7 +205,7 @@
             return details
 
         code = error.code()
-        log.debug("Received code %d from node details call: %s" % (code, error))
+        log.debug("Received code {code} from node details call: {err}", code=code, err=error)
 
         if code in RETRY_CODES:
             tries -= 1
@@ -254,7 +254,7 @@
             return results
 
         code = error.code()
-        log.debug("Received code %d from query call: %s" % (code, error))
+        log.debug("Received code {code} from query call: {err}", code=code, err=error)
 
         if code in RETRY_CODES:
             tries -= 1
@@ -308,7 +308,7 @@
             return results
 
         code = error.code()
-        log.debug("Received code %d from query call: %s" % (code, error))
+        log.debug("Received code {code} from query call: {err}", code=code, err=error)
 
         if code in RETRY_CODES:
             tries -= 1
@@ -361,7 +361,7 @@
             return results
 
         code = error.code()
-        log.debug("Received code %d from query call: %s" % (code, error))
+        log.debug("Received code {code} from query call: {err}", code=code, err=error)
 
         if code in RETRY_CODES:
             tries -= 1
@@ -393,7 +393,7 @@
             return record
 
         code = error.code()
-        log.debug("Received code %d from recordWithRecordType call: %s" % (code, error))
+        log.debug("Received code {code} from recordWithRecordType call: {err}", code=code, err=error)
 
         if code in RETRY_CODES:
             tries -= 1
@@ -422,22 +422,22 @@
     tries = NUM_TRIES
     while tries:
 
-        log.debug("Checking basic auth for user '%s' (tries remaining: %d)" %
-            (user, tries))
+        log.debug("Checking basic auth for user '{user}' (tries remaining: {tries})", 
+            user=user, tries=tries)
 
         result, error = record.verifyPassword_error_(password, None)
         if not error:
-            log.debug("Basic auth for user '%s' result: %s" % (user, result))
+            log.debug("Basic auth for user '{user}' result: {result}", user=user, result=result)
             return result
 
         code = error.code()
 
         if code == INCORRECT_CREDENTIALS:
-            log.debug("Basic auth for user '%s' failed due to incorrect credentials" % (user,))
+            log.debug("Basic auth for user '{user}' failed due to incorrect credentials", user=user)
             return False
 
-        log.debug("Basic auth for user '%s' failed with code %d (%s)" %
-            (user, code, error))
+        log.debug("Basic auth for user '{user}' failed with code {code} ({err})",
+            user=user, code=code, err=error)
 
         if code in RETRY_CODES:
             tries -= 1
@@ -468,8 +468,8 @@
     tries = NUM_TRIES
     while tries:
 
-        log.debug("Checking digest auth for user '%s' (tries remaining: %d)" %
-            (user, tries))
+        log.debug("Checking digest auth for user '{user}' (tries remaining: {tries})",
+            user=user, tries=tries)
 
         # TODO: what are these other return values?
         result, mystery1, mystery2, error = record.verifyExtendedWithAuthenticationType_authenticationItems_continueItems_context_error_(
@@ -478,17 +478,17 @@
             None, None, None
         )
         if not error:
-            log.debug("Digest auth for user '%s' result: %s" % (user, result))
+            log.debug("Digest auth for user '{user}' result: {result}", user=user, result=result)
             return result
 
         code = error.code()
 
         if code == INCORRECT_CREDENTIALS:
-            log.debug("Digest auth for user '%s' failed due to incorrect credentials" % (user,))
+            log.debug("Digest auth for user '{user}' failed due to incorrect credentials", user=user)
             return False
 
-        log.debug("Digest auth for user '%s' failed with code %d (%s)" %
-            (user, code, error))
+        log.debug("Digest auth for user '{user}' failed with code {code} ({err})",
+            user=user, code=code, err=error)
 
         if code in RETRY_CODES:
             tries -= 1
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130712/27b26b37/attachment-0001.html>