Merge lp:~mterry/duplicity/log-upload-events into lp:~duplicity-team/duplicity/trunk

[Kenneth Loafman]

[Kenneth Loafman (kenneth-loafman)]

I think this should merge, assuming Peter's changes are not in conflict.

[lp:~mterry/duplicity/log-upload-events]

520. By Michael Terry on 2009-06-19

merge with trunk

=== modified file 'duplicity/asyncscheduler.py'
--- duplicity/asyncscheduler.py	2009-04-02 14:47:12 +0000
+++ duplicity/asyncscheduler.py	2009-05-30 13:18:40 +0000
@@ -143,12 +143,14 @@
             # special case this to not require any platform support for
             # threading at all
             log.Info("%s: %s" % (self.__class__.__name__,
-                     _("running task synchronously (asynchronicity disabled)")))
+                     _("running task synchronously (asynchronicity disabled)")),
+                     log.InfoCode.synchronous_upload_begin)
 
             return self.__run_synchronously(fn, params)
         else:
             log.Info("%s: %s" % (self.__class__.__name__,
-                     _("scheduling task for asynchronous execution")))
+                     _("scheduling task for asynchronous execution")),
+                     log.InfoCode.asynchronous_upload_begin)
 
             return self.__run_asynchronously(fn, params)
 
@@ -177,7 +179,8 @@
             return ret
 
         log.Info("%s: %s" % (self.__class__.__name__,
-                 _("task completed successfully")))
+                 _("task completed successfully")),
+                 log.InfoCode.synchronous_upload_done)
 
         return _waiter
 
@@ -191,7 +194,8 @@
                 # late triggering the failure. this should be improved.
                 log.Info("%s: %s" % (self.__class__.__name__,
                          _("a previously scheduled task has failed; "
-                           "propagating the result immediately")))
+                           "propagating the result immediately")),
+                         log.InfoCode.asynchronous_upload_done)
                 self.__waiter()
                 raise AssertionError("%s: waiter should have raised an exception; "
                                      "this is a bug" % (self.__class__.__name__,))
@@ -292,7 +296,8 @@
                     with_lock(self.__cv, _signal_failed)
 
                 log.Info("%s: %s" % (self.__class__.__name__,
-                         _("task execution done (success: %s)") % succeeded))
+                         _("task execution done (success: %s)") % succeeded),
+                         log.InfoCode.asynchronous_upload_done)
 
                 def _postwork():
                     self.__curconc -= 1

=== modified file 'duplicity/log.py'
--- duplicity/log.py	2009-05-07 16:33:39 +0000
+++ duplicity/log.py	2009-05-30 13:18:40 +0000
@@ -86,6 +86,10 @@
     patch_file_patching = 8
     #file_list = 9 # 9 isn't used anymore.  It corresponds to an older syntax for listing files
     file_list = 10
+    synchronous_upload_begin = 11
+    asynchronous_upload_begin = 12
+    synchronous_upload_done = 13
+    asynchronous_upload_done = 14
 
 def Info(s, code=InfoCode.generic, extra=None):
     """Shortcut used for info messages (verbosity 5)."""