[CalendarServer-changes] [6912] CalendarServer/trunk/calendarserver/tools/purge.py

[source_changes at macosforge.org]

Revision: 6912
          http://trac.macosforge.org/projects/calendarserver/changeset/6912
Author:   wsanchez at apple.com
Date:     2011-02-08 11:34:33 -0800 (Tue, 08 Feb 2011)
Log Message:
-----------
Errors should go to stderr

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/tools/purge.py

Modified: CalendarServer/trunk/calendarserver/tools/purge.py
===================================================================
--- CalendarServer/trunk/calendarserver/tools/purge.py	2011-02-08 18:50:26 UTC (rev 6911)
+++ CalendarServer/trunk/calendarserver/tools/purge.py	2011-02-08 19:34:33 UTC (rev 6912)
@@ -16,30 +16,35 @@
 # limitations under the License.
 ##
 
-from calendarserver.tap.caldav import CalDAVServiceMaker, CalDAVOptions
-from twisted.application.service import Service
-from calendarserver.tap.util import FakeRequest
-from calendarserver.tap.util import getRootResource
-from calendarserver.tools.principals import removeProxy
-from calendarserver.tools.util import loadConfig
+import os
+import sys
+
 from datetime import date, timedelta, datetime
 from getopt import getopt, GetoptError
-from twext.python.log import Logger
-from twext.web2.dav import davxml
-from twext.web2.responsecode import NO_CONTENT
+
+from vobject.icalendar import utc
+
+from twisted.application.service import Service
 from twisted.internet import reactor
 from twisted.internet.defer import inlineCallbacks, returnValue
 from twistedcaldav import caldavxml
 from twistedcaldav.caldavxml import TimeRange
 from twistedcaldav.config import config, ConfigurationError
+from twistedcaldav.datafilters.peruserdata import PerUserDataFilter
 from twistedcaldav.directory.directory import DirectoryRecord
 from twistedcaldav.method.put_common import StoreCalendarObjectResource
 from twistedcaldav.query import calendarqueryfilter
-from twistedcaldav.datafilters.peruserdata import PerUserDataFilter
-from vobject.icalendar import utc
-import os
-import sys
 
+from twext.python.log import Logger
+from twext.web2.dav import davxml
+from twext.web2.responsecode import NO_CONTENT
+
+from calendarserver.tap.caldav import CalDAVServiceMaker, CalDAVOptions
+from calendarserver.tap.util import FakeRequest
+from calendarserver.tap.util import getRootResource
+from calendarserver.tools.principals import removeProxy
+from calendarserver.tools.util import loadConfig
+
 log = Logger()
 
 def usage_purge_events(e=None):
@@ -125,7 +130,7 @@
                 self.cutoff, self.batchSize, verbose=self.verbose,
                 dryrun=self.dryrun))
         except Exception, e:
-            print "Error:", e
+            sys.stderr.write("Error: %s\n" % (e,))
             raise
 
         finally:
@@ -147,7 +152,7 @@
             (yield purgeOrphanedAttachments(self._store, self.batchSize,
                 verbose=self.verbose, dryrun=self.dryrun))
         except Exception, e:
-            print "Error:", e
+            sys.stderr.write("Error: %s\n" % (e,))
             raise
 
         finally:
@@ -177,7 +182,7 @@
                 else:
                     print "Modified or deleted %s" % (amount,)
         except Exception, e:
-            print "Error:", e
+            sys.stderr.write("Error: %s\n" % (e,))
             raise
         finally:
             reactor.stop()
@@ -199,7 +204,7 @@
         reactor.addSystemEventTrigger("before", "shutdown", service.stopService)
 
     except ConfigurationError, e:
-        print "Error: %s" % (e,)
+        sys.stderr.write("Error: %s\n" % (e,))
         return
 
     reactor.run()
@@ -397,7 +402,7 @@
         else:
             print "Purged %d events" % (count,)
     except Exception, e:
-        print "Error: %s" % (e,)
+        sys.stderr.write("Error: %s\n" % (e,))
     finally:
         reactor.stop()
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110208/17e48d4b/attachment.html>