From 5de4f4094e1fa4614ce0237ed7ab2d4fa07e994a Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Thu, 7 Mar 2019 13:30:47 -0500 Subject: [PATCH] let it not return a Deferred --- src/allmydata/util/eliotutil.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/allmydata/util/eliotutil.py b/src/allmydata/util/eliotutil.py index 44efe7265..414c7b2f3 100644 --- a/src/allmydata/util/eliotutil.py +++ b/src/allmydata/util/eliotutil.py @@ -81,6 +81,7 @@ from twisted.logger import ( ) from twisted.internet.defer import ( inlineCallbacks, + maybeDeferred, ) from twisted.application.service import Service @@ -486,6 +487,7 @@ def log_call_deferred(action_type, include_args=False): with start_action(action_type=action_type, **action_kw).context(): # Use addActionFinish so that the action finishes when the # Deferred fires. - return DeferredContext(f(*a, **kw)).addActionFinish() + d = maybeDeferred(f, *a, **kw) + return DeferredContext(d).addActionFinish() return logged_f return decorate_log_call_deferred