Fix ModuleApi.looping_background_call for non-async functions (#11524)

After #10847, `looping_background_call` would print an error in the logs every time a non-async function was called. Since the error would be caught and ignored immediately, there were no other side effects.
matrix-org · Dec 7, 2021 · eccc49d · eccc49d
1 parent b1ecd19
commit eccc49d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/changelog.d/11524.bugfix b/changelog.d/11524.bugfix
@@ -0,0 +1 @@
+Fix a regression in Synapse 1.48.0 where the module API's `looping_background_call` method would spam errors to the logs when given a non-async function.
diff --git a/synapse/module_api/__init__.py b/synapse/module_api/__init__.py
@@ -108,6 +108,7 @@
     create_requester,
 )
 from synapse.util import Clock
+from synapse.util.async_helpers import maybe_awaitable
 from synapse.util.caches.descriptors import cached
 
 if TYPE_CHECKING:
@@ -1014,9 +1015,7 @@ def looping_background_call(
                 run_as_background_process,
                 msec,
                 desc,
-                f,
-                *args,
-                **kwargs,
+                lambda: maybe_awaitable(f(*args, **kwargs)),
             )
         else:
             logger.warning(