[CalendarServer-changes] [2683] CalendarServer/branches/users/sagen/xmpp/twistedcaldav/config.py

[source_changes at macosforge.org]

Revision: 2683
          http://trac.macosforge.org/projects/calendarserver/changeset/2683
Author:   wsanchez at apple.com
Date:     2008-07-11 10:31:43 -0700 (Fri, 11 Jul 2008)
Log Message:
-----------
Don't use None in defaultConfig because plistlib hates it.
Verify that XMPPNotifierService settings aren't empty.

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

Modified: CalendarServer/branches/users/sagen/xmpp/twistedcaldav/config.py
===================================================================
--- CalendarServer/branches/users/sagen/xmpp/twistedcaldav/config.py	2008-07-11 17:18:41 UTC (rev 2682)
+++ CalendarServer/branches/users/sagen/xmpp/twistedcaldav/config.py	2008-07-11 17:31:43 UTC (rev 2683)
@@ -185,11 +185,11 @@
             {
                 "Service" : "twistedcaldav.notify.XMPPNotifierService",
                 "Enabled" : False,
-                "Host" : "xmpp.host.name",
+                "Host" : "", # "xmpp.host.name"
                 "Port" : 5222,
-                "JID" : "jid at xmpp.host/resource",
-                "Password" : "password_goes_here",
-                "ServiceAddress" : "pubsub.xmpp.host.name",
+                "JID" : "", # "jid at xmpp.host.name/resource"
+                "Password" : "",
+                "ServiceAddress" : "", # "pubsub.xmpp.host.name"
                 "KeepAliveSeconds" : 120,
             },
         ]
@@ -386,6 +386,16 @@
         else:
             self.Notifications["Enabled"] = False
 
+        for service in self.Notifications["Services"]:
+            if (
+                service["Service"] == "twistedcaldav.notify.XMPPNotifierService" and
+                service["Enabled"]
+            ):
+                for key, value in service.iteritems():
+                    if not value:
+                        raise ConfigurationError("Invalid %s for XMPPNotifierService: %r"
+                                                 % (key, value))
+
     def updateLogLevels(self):
         clearLogLevels()
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20080711/ef3ec384/attachment.html