[Checkins] SVN: mongopersist/trunk/ Added transaction ID to LoggingDecorator

[Adam Groszer]

Log message for revision 124801:
  Added transaction ID to LoggingDecorator

Changed:
  U   mongopersist/trunk/CHANGES.txt
  U   mongopersist/trunk/src/mongopersist/datamanager.py
  U   mongopersist/trunk/src/mongopersist/tests/test_datamanager.py

-=-
Modified: mongopersist/trunk/CHANGES.txt
===================================================================
--- mongopersist/trunk/CHANGES.txt	2012-03-29 23:06:16 UTC (rev 124800)
+++ mongopersist/trunk/CHANGES.txt	2012-03-30 07:55:49 UTC (rev 124801)
@@ -5,6 +5,8 @@
 0.7.0 (2012-03-??)
 ------------------
 
+- Added transaction ID to LoggingDecorator
+
 - Feature: A new ``IConflictHandler`` interface now controls all aspects of
   conflict resolution. The following implementations are provided:
 

Modified: mongopersist/trunk/src/mongopersist/datamanager.py
===================================================================
--- mongopersist/trunk/src/mongopersist/datamanager.py	2012-03-29 23:06:16 UTC (rev 124800)
+++ mongopersist/trunk/src/mongopersist/datamanager.py	2012-03-30 07:55:49 UTC (rev 124801)
@@ -91,12 +91,15 @@
                 tb = ''.join(exceptionformatter.extract_stack(
                     sys.exc_info()[2].tb_frame.f_back, limit=self.TB_LIMIT))
         else:
-            tb = '<omitted>'
+            tb = '  <omitted>'
 
+        txn = transaction.get()
+        txn = '%i - %s' %(id(txn), txn.description),
+
         COLLECTION_LOG.debug(
-            "collection: %s.%s %s,\n args:%r,\n kwargs:%r, \n tb:\n%s",
+            "collection: %s.%s %s,\n TXN:%s,\n args:%r,\n kwargs:%r, \n tb:\n%s",
             self.collection.database.name, self.collection.name,
-            self.function.__name__, args, kwargs, tb)
+            self.function.__name__, txn, args, kwargs, tb)
 
         return self.function(*args, **kwargs)
 

Modified: mongopersist/trunk/src/mongopersist/tests/test_datamanager.py
===================================================================
--- mongopersist/trunk/src/mongopersist/tests/test_datamanager.py	2012-03-29 23:06:16 UTC (rev 124800)
+++ mongopersist/trunk/src/mongopersist/tests/test_datamanager.py	2012-03-30 07:55:49 UTC (rev 124801)
@@ -859,6 +859,7 @@
       >>> logging_find = datamanager.LoggingDecorator(coll, coll.find)
       >>> list(logging_find({'life': 42}))
       collection: mongopersist_test.mongopersist.tests.test_datamanager.Foo find,
+       TXN:('... - ',),
        args:({'life': 42},),
        kwargs:{},
        tb:
@@ -871,6 +872,7 @@
 
       >>> list(logging_find(spec={'life': 42}))
       collection: mongopersist_test.mongopersist.tests.test_datamanager.Foo find,
+       TXN:('... - ',),
        args:(),
        kwargs:{'spec': {'life': 42}},
        tb:
@@ -884,10 +886,11 @@
       >>> logging_find.ADD_TB = False
       >>> list(logging_find({'life': 42}))
       collection: mongopersist_test.mongopersist.tests.test_datamanager.Foo find,
+       TXN:('... - ',),
        args:({'life': 42},),
        kwargs:{},
        tb:
-      <omitted>
+        <omitted>
       []
     """