Daira's fix to the hook mixin

[tahoe-lafs/tahoe-lafs.git] / src / allmydata / util / deferredutil.py

diff --git a/src/allmydata/util/deferredutil.py b/src/allmydata/util/deferredutil.py
index 34aa37773ab805936d780173f223b30b02cf37b9..9a212378f8838a7482f36014bb2c2e96fd7e3466 100644 (file)
--- a/src/allmydata/util/deferredutil.py
+++ b/src/allmydata/util/deferredutil.py
@@ -101,7 +101,7 @@ class HookMixin:
         self._hooks[name] = (d, ignore_count)
         return d
 
-    def _call_hook(self, res, name):
+    def _call_hook(self, res, name, async=False):
         """
         Called to trigger the hook, with argument 'res'. This is a no-op if
         the hook is unset. If the hook's ignore_count is positive, it will be
@@ -124,7 +124,10 @@ class HookMixin:
             self._hooks[name] = (d, ignore_count - 1)
         else:
             self._hooks[name] = None
-            _with_log(eventually_callback(d), res)
+            if async:
+                _with_log(eventually_callback(d), res)
+            else:
+                _with_log(d.callback, res)
         return res
 
     def _log(self, msg):