[CalendarServer-changes] [4421] CalendarServer/trunk/calendarserver/tap/caldav.py

[source_changes at macosforge.org]

Revision: 4421
          http://trac.macosforge.org/projects/calendarserver/changeset/4421
Author:   wsanchez at apple.com
Date:     2009-07-02 14:47:59 -0700 (Thu, 02 Jul 2009)
Log Message:
-----------
Print version info at startup

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/tap/caldav.py

Modified: CalendarServer/trunk/calendarserver/tap/caldav.py
===================================================================
--- CalendarServer/trunk/calendarserver/tap/caldav.py	2009-07-02 21:32:52 UTC (rev 4420)
+++ CalendarServer/trunk/calendarserver/tap/caldav.py	2009-07-02 21:47:59 UTC (rev 4421)
@@ -58,6 +58,12 @@
 from twext.internet.ssl import ChainingOpenSSLContextFactory
 from twext.web2.channel.http import HTTP503LoggingFactory
 
+try:
+    from twistedcaldav.version import version
+except ImportError:
+    sys.path.insert(0, os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(__file__))), "support"))
+    from version import version as getVersion
+    version = "%s (%s)" % getVersion()
 from twistedcaldav.log import Logger, LoggingMixIn
 from twistedcaldav.log import logLevelForNamespace, setLogLevelForNamespace
 from twistedcaldav.accesslog import DirectoryLogWrapperResource
@@ -330,7 +336,7 @@
     implements(IPlugin, IServiceMaker)
 
     tapname = "caldav"
-    description = "The Darwin Calendar Server"
+    description = "Darwin Calendar Server"
     options = CalDAVOptions
 
     #
@@ -346,8 +352,8 @@
     webAdminResourceClass        = WebAdminResource
 
     def makeService(self, options):
+        self.log_info("%s %s starting %s process..." % (self.description, version, config.ProcessType))
 
-
         serviceMethod = getattr(self, "makeService_%s" % (config.ProcessType,), None)
 
         if not serviceMethod:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20090702/7c801d1b/attachment.html>