[CalendarServer-changes] [2670] CalendarServer/branches/users/sagen/xmpp/twistedcaldav/notify.py

[source_changes at macosforge.org]

Revision: 2670
          http://trac.macosforge.org/projects/calendarserver/changeset/2670
Author:   sagen at apple.com
Date:     2008-07-09 10:40:34 -0700 (Wed, 09 Jul 2008)
Log Message:
-----------
For debugging, forward pubsub events to TestJID

Modified Paths:
--------------
    CalendarServer/branches/users/sagen/xmpp/twistedcaldav/notify.py

Modified: CalendarServer/branches/users/sagen/xmpp/twistedcaldav/notify.py
===================================================================
--- CalendarServer/branches/users/sagen/xmpp/twistedcaldav/notify.py	2008-07-09 17:13:36 UTC (rev 2669)
+++ CalendarServer/branches/users/sagen/xmpp/twistedcaldav/notify.py	2008-07-09 17:40:34 UTC (rev 2670)
@@ -441,15 +441,6 @@
             nodeName = self.uriToNodeName(uri)
             self.publishNode(nodeName)
 
-            # Also send message to test JID, if specified:
-            testJid = self.settings.get("TestJID", "")
-            if testJid:
-                message = domish.Element(('jabber:client', 'message'))
-                message['to'] = testJid
-                message.addElement('body', None, "Calendar change: %s"
-                    % (nodeName,))
-                self.xmlStream.send(message)
-
     def uriToNodeName(self, uri):
         principal = uri.split('/')[3]
         return self.nodeNameFormat % ('test', principal)
@@ -616,15 +607,23 @@
             (self.jid,))
 
     def handleMessage(self, elem):
-        # Simply echo back any message sent to us.  Could be used later for
-        # something more interesting.
-        sender = JID(elem['from']).full()
         body = getattr(elem, 'body', None)
+        if not body:
+            event = getattr(elem, 'event', None)
+            if event:
+                body = domish.Element((None, 'body'))
+                body.addContent(event.toXml().encode('utf-8'))
         if body:
+            # forward message to test JID, if specified; else bounce to sender:
+            testJid = self.settings.get("TestJID", "")
+            if testJid:
+                dest = testJid
+            else:
+                dest = JID(elem['from']).full()
+
             message = domish.Element(('jabber:client', 'message'))
-            message['to'] = sender
+            message['to'] = dest
             message.addChild(body)
-            self.trafficLog(message)
             self.xmlStream.send(message)
 
     def sendPresence(self):
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20080709/28329125/attachment-0001.html