[CalendarServer-changes] [11495] CalendarServer/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Mon Jul 8 16:55:49 PDT 2013
Revision: 11495
http://trac.calendarserver.org//changeset/11495
Author: sagen at apple.com
Date: 2013-07-08 16:55:49 -0700 (Mon, 08 Jul 2013)
Log Message:
-----------
Install calendarserver_upgrade
Modified Paths:
--------------
CalendarServer/trunk/calendarserver/tools/upgrade.py
CalendarServer/trunk/setup.py
Modified: CalendarServer/trunk/calendarserver/tools/upgrade.py
===================================================================
--- CalendarServer/trunk/calendarserver/tools/upgrade.py 2013-07-08 20:27:36 UTC (rev 11494)
+++ CalendarServer/trunk/calendarserver/tools/upgrade.py 2013-07-08 23:55:49 UTC (rev 11495)
@@ -28,7 +28,7 @@
from twisted.python.text import wordWrap
from twisted.python.usage import Options, UsageError
-from twext.python.log import Logger, LogLevel
+from twext.python.log import Logger, LogLevel, formatEvent, addObserver
from twistedcaldav.stdconfig import DEFAULT_CONFIG_FILE
from twisted.application.service import Service
@@ -194,13 +194,14 @@
def makeService(store):
return UpgraderService(store, options, output, reactor, config)
- def onlyUpgradeEvents(event):
- output.write(logDateString() + " " + log.textFromEventDict(event) + "\n")
+ def onlyUpgradeEvents(eventDict):
+ text = formatEvent(eventDict)
+ output.write(logDateString() + " " + text + "\n")
output.flush()
if not options["status"]:
log.publisher.levels.setLogLevelForNamespace(None, LogLevel.debug)
- log.addObserver(onlyUpgradeEvents)
+ addObserver(onlyUpgradeEvents)
def customServiceMaker():
customService = CalDAVServiceMaker()
Modified: CalendarServer/trunk/setup.py
===================================================================
--- CalendarServer/trunk/setup.py 2013-07-08 20:27:36 UTC (rev 11494)
+++ CalendarServer/trunk/setup.py 2013-07-08 23:55:49 UTC (rev 11495)
@@ -155,7 +155,7 @@
"bin/calendarserver_purge_events",
"bin/calendarserver_purge_principals",
"bin/calendarserver_shell",
- #"bin/calendarserver_upgrade",
+ "bin/calendarserver_upgrade",
#"bin/calendarserver_verify_data",
],
data_files=[("caldavd", ["conf/caldavd.plist"]), ],
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130708/e094684b/attachment.html>
More information about the calendarserver-changes
mailing list