[CalendarServer-changes] [8743] CalendarServer/branches/users/cdaboo/txn-debugging/twistedcaldav

[source_changes at macosforge.org]

Revision: 8743
          http://trac.macosforge.org/projects/calendarserver/changeset/8743
Author:   cdaboo at apple.com
Date:     2012-02-21 15:15:20 -0800 (Tue, 21 Feb 2012)
Log Message:
-----------
Add a label for inNewTransaction so we can tell the difference between different invocations.

Modified Paths:
--------------
    CalendarServer/branches/users/cdaboo/txn-debugging/twistedcaldav/scheduling/processing.py
    CalendarServer/branches/users/cdaboo/txn-debugging/twistedcaldav/storebridge.py

Modified: CalendarServer/branches/users/cdaboo/txn-debugging/twistedcaldav/scheduling/processing.py
===================================================================
--- CalendarServer/branches/users/cdaboo/txn-debugging/twistedcaldav/scheduling/processing.py	2012-02-21 23:14:44 UTC (rev 8742)
+++ CalendarServer/branches/users/cdaboo/txn-debugging/twistedcaldav/scheduling/processing.py	2012-02-21 23:15:20 UTC (rev 8743)
@@ -333,7 +333,7 @@
             # inNewTransaction wipes out the remembered resource<-> URL mappings in the
             # request object but we need to be able to map the actual reply resource to its
             # URL when doing auto-processing, so we have to sneak that mapping back in here.
-            txn = yield self.organizer_calendar_resource.inNewTransaction(self.request)
+            txn = yield self.organizer_calendar_resource.inNewTransaction(self.request, label="Delayed attendee refresh")
 
             try:
                 organizer_resource = (yield self.request.locateResource(self.organizer_calendar_resource._url))
@@ -643,7 +643,7 @@
             # inNewTransaction wipes out the remembered resource<-> URL mappings in the
             # request object but we need to be able to map the actual reply resource to its
             # URL when doing auto-processing, so we have to sneak that mapping back in here.
-            txn = yield resource.inNewTransaction(self.request)
+            txn = yield resource.inNewTransaction(self.request, label="Send Attendee auto-reply")
 
             try:
                 self.request._rememberResource(resource, resource._url)

Modified: CalendarServer/branches/users/cdaboo/txn-debugging/twistedcaldav/storebridge.py
===================================================================
--- CalendarServer/branches/users/cdaboo/txn-debugging/twistedcaldav/storebridge.py	2012-02-21 23:14:44 UTC (rev 8742)
+++ CalendarServer/branches/users/cdaboo/txn-debugging/twistedcaldav/storebridge.py	2012-02-21 23:15:20 UTC (rev 8743)
@@ -1845,7 +1845,7 @@
     _componentFromStream = VCalendar.fromString
 
     @inlineCallbacks
-    def inNewTransaction(self, request):
+    def inNewTransaction(self, request, label=""):
         """
         Implicit auto-replies need to span multiple transactions.  Clean out
         the given request's resource-lookup mapping, transaction, and re-look-
@@ -1861,7 +1861,7 @@
         ownerHome = calendar.ownerCalendarHome()
         homeUID = ownerHome.uid()
         txn = ownerHome.transaction().store().newTransaction(
-            "new transaction for " + self._newStoreObject.name())
+            "new transaction for %s, doing: %s" % (self._newStoreObject.name(), label,))
         newParent = (yield (yield txn.calendarHomeWithUID(homeUID))
                              .calendarWithName(calendarName))
         newObject = (yield newParent.calendarObjectWithName(objectName))
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120221/0184dee5/attachment.html>