[CalendarServer-changes] [1879] CalendarServer/branches/users/cdaboo/server2server-1842/ twistedcaldav

[source_changes at macosforge.org]

Revision: 1879
          http://trac.macosforge.org/projects/calendarserver/changeset/1879
Author:   cdaboo at apple.com
Date:     2007-09-19 06:04:16 -0700 (Wed, 19 Sep 2007)

Log Message:
-----------
Need better logging for this stuff!

Modified Paths:
--------------
    CalendarServer/branches/users/cdaboo/server2server-1842/twistedcaldav/schedule_common.py
    CalendarServer/branches/users/cdaboo/server2server-1842/twistedcaldav/servertoserver.py

Modified: CalendarServer/branches/users/cdaboo/server2server-1842/twistedcaldav/schedule_common.py
===================================================================
--- CalendarServer/branches/users/cdaboo/server2server-1842/twistedcaldav/schedule_common.py	2007-09-18 02:17:08 UTC (rev 1878)
+++ CalendarServer/branches/users/cdaboo/server2server-1842/twistedcaldav/schedule_common.py	2007-09-19 13:04:16 UTC (rev 1879)
@@ -61,18 +61,24 @@
     class CalendarUser(object):
         def __init__(self, cuaddr):
             self.cuaddr = cuaddr
-            
+
     class LocalCalendarUser(CalendarUser):
         def __init__(self, cuaddr, principal, inbox=None, inboxURL=None):
             self.cuaddr = cuaddr
             self.principal = principal
             self.inbox = inbox
             self.inboxURL = inboxURL
+        
+        def __str__(self):
+            return "Local calendar user: %s" % (self.cuaddr,)
 
     class RemoteCalendarUser(CalendarUser):
         def __init__(self, cuaddr):
             self.cuaddr = cuaddr
             self.extractDomain()
+
+        def __str__(self):
+            return "Remote calendar user: %s" % (self.cuaddr,)
         
         def extractDomain(self):
             if self.cuaddr.startswith("mailto:"):
@@ -85,7 +91,9 @@
                 self.domain = ""
 
     class InvalidCalendarUser(CalendarUser):
-        pass
+        
+        def __str__(self):
+            return "Invalid calendar user: %s" % (self.cuaddr,)
 
             
     def __init__(self, request, resource):

Modified: CalendarServer/branches/users/cdaboo/server2server-1842/twistedcaldav/servertoserver.py
===================================================================
--- CalendarServer/branches/users/cdaboo/server2server-1842/twistedcaldav/servertoserver.py	2007-09-18 02:17:08 UTC (rev 1878)
+++ CalendarServer/branches/users/cdaboo/server2server-1842/twistedcaldav/servertoserver.py	2007-09-19 13:04:16 UTC (rev 1879)
@@ -15,6 +15,9 @@
 #
 # DRI: Cyrus Daboo, cdaboo at apple.com
 ##
+from twisted.web2.dav.util import allDataFromStream
+from twisted.web2.stream import MemoryStream
+import logging
 
 """
 Server to server utility functions and client requests.
@@ -108,11 +111,21 @@
             proto = d.getResult()
             
             log.msg("Sending server-to-server POST request: %s" % (self.server.path,))
+            if logging.canLog("debug"):
+                logging.debug(self.headers, system="Server-to-server Send")
+                logging.debug(self.data, system="Server-to-server Send")
             d = waitForDeferred(proto.submitRequest(ClientRequest("POST", self.server.path, self.headers, self.data)))
             yield d
             response = d.getResult()
     
             log.msg("Received server-to-server POST response: %s" % (response.code,))
+            if logging.canLog("debug"):
+                logging.debug(response.headers, system="Server-to-server Send")
+                d = waitForDeferred(allDataFromStream(response.stream))
+                yield d
+                data = d.getResult()
+                logging.debug(data, system="Server-to-server Send")
+                response.stream = MemoryStream(data)
             d = waitForDeferred(davXMLFromStream(response.stream))
             yield d
             xml = d.getResult()

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