[CalendarServer-changes] [1046] CalendarServer/branches/users/cdaboo/od-schema-1044/twistedcaldav/ directory/appleopendirectory.py

[source_changes at macosforge.org]

Revision: 1046
          http://trac.macosforge.org/projects/calendarserver/changeset/1046
Author:   cdaboo at apple.com
Date:     2007-01-15 16:52:45 -0800 (Mon, 15 Jan 2007)

Log Message:
-----------
Clean up exception handling.

Modified Paths:
--------------
    CalendarServer/branches/users/cdaboo/od-schema-1044/twistedcaldav/directory/appleopendirectory.py

Modified: CalendarServer/branches/users/cdaboo/od-schema-1044/twistedcaldav/directory/appleopendirectory.py
===================================================================
--- CalendarServer/branches/users/cdaboo/od-schema-1044/twistedcaldav/directory/appleopendirectory.py	2007-01-15 21:46:36 UTC (rev 1045)
+++ CalendarServer/branches/users/cdaboo/od-schema-1044/twistedcaldav/directory/appleopendirectory.py	2007-01-16 00:52:45 UTC (rev 1046)
@@ -53,9 +53,11 @@
         """
         @param node: an OpenDirectory node name to bind to.
         """
-        directory = opendirectory.odInit(node)
-        if directory is None:
-            raise OpenDirectoryInitError("Failed to open Open Directory Node: %s" % (node,))
+        try:
+            directory = opendirectory.odInit(node)
+        except opendirectory.ODError, ex:
+            log.msg("Open Directory (node=%s) Initialization error: %s" % (node, str(ex)))
+            raise
 
         self.realmName = node
         self.directory = directory
@@ -123,7 +125,7 @@
             try:
                 results = opendirectory.listAllRecordsWithAttributes(self.directory, listRecordType, attrs)
             except opendirectory.ODError, ex:
-                log.msg("OpenDirectory error: %s", str(ex))
+                log.msg("Open Directory (node=%s) error: %s" % (self.realmName, str(ex)))
                 raise
 
             for (key, value) in results.iteritems():
@@ -240,7 +242,7 @@
             try:
                 return opendirectory.authenticateUserBasic(self.service.directory, self.shortName, credentials.password)
             except opendirectory.ODError, e:
-                log.err("OpenDirectory error while performing basic authentication for user %s: %r" % (self.shortName, e))
+                log.err("Open Directory (node=%s) error while performing basic authentication for user %s: %r" % (self.service.realmName, self.shortName, e))
                 return False
 
         return super(OpenDirectoryRecord, self).verifyCredentials(credentials)

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20070115/79681388/attachment.html