[CalendarServer-changes] [15098] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 15098
          http://trac.calendarserver.org//changeset/15098
Author:   cdaboo at apple.com
Date:     2015-09-03 13:56:27 -0700 (Thu, 03 Sep 2015)
Log Message:
-----------
Improve logging.

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/webadmin/principals.py
    CalendarServer/trunk/calendarserver/webadmin/work.py
    CalendarServer/trunk/txdav/common/datastore/sql.py
    CalendarServer/trunk/txdav/common/datastore/sql_util.py

Modified: CalendarServer/trunk/calendarserver/webadmin/principals.py
===================================================================
--- CalendarServer/trunk/calendarserver/webadmin/principals.py	2015-09-03 20:55:23 UTC (rev 15097)
+++ CalendarServer/trunk/calendarserver/webadmin/principals.py	2015-09-03 20:56:27 UTC (rev 15098)
@@ -208,7 +208,7 @@
 
         calendarComponents = []
 
-        txn = self._store.newTransaction()
+        txn = self._store.newTransaction(label="PrincipalCalendarsExportResource")
         try:
             calendarHome = yield txn.calendarHomeWithUID(uid)
 

Modified: CalendarServer/trunk/calendarserver/webadmin/work.py
===================================================================
--- CalendarServer/trunk/calendarserver/webadmin/work.py	2015-09-03 20:55:23 UTC (rev 15097)
+++ CalendarServer/trunk/calendarserver/webadmin/work.py	2015-09-03 20:56:27 UTC (rev 15098)
@@ -114,7 +114,7 @@
 
         self._polling = True
 
-        txn = self._store.newTransaction()
+        txn = self._store.newTransaction(label="WorkEventsResource.poll")
         try:
 
             # Look up all of the jobs

Modified: CalendarServer/trunk/txdav/common/datastore/sql.py
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql.py	2015-09-03 20:55:23 UTC (rev 15097)
+++ CalendarServer/trunk/txdav/common/datastore/sql.py	2015-09-03 20:56:27 UTC (rev 15098)
@@ -227,7 +227,7 @@
         Implementation of L{ICalendarStore.withEachCalendarHomeDo} and
         L{IAddressbookStore.withEachAddressbookHomeDo}.
         """
-        txn = yield self.newTransaction()
+        txn = yield self.newTransaction(label="CommonDataStore._withEachHomeDo")
         try:
             allUIDs = yield (Select([homeTable.OWNER_UID], From=homeTable).on(txn))
             for [uid] in allUIDs:

Modified: CalendarServer/trunk/txdav/common/datastore/sql_util.py
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_util.py	2015-09-03 20:55:23 UTC (rev 15097)
+++ CalendarServer/trunk/txdav/common/datastore/sql_util.py	2015-09-03 20:56:27 UTC (rev 15098)
@@ -849,7 +849,7 @@
     Fix all UUIDs in the given SQL store to be in a canonical form;
     00000000-0000-0000-0000-000000000000 format and upper-case.
     """
-    t = store.newTransaction(disableCache=True)
+    t = store.newTransaction(label="fixUUIDNormalization", disableCache=True)
 
     # First, let's see if there are any calendar, addressbook, or notification
     # homes that have a de-normalized OWNER_UID.  If there are none, then we can
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150903/05531fb6/attachment.html>