Merge branch 'develop' of github.com:matrix-org/synapse into presence_logging

Conflicts:
	synapse/handlers/presence.py

1 files changed, 2 insertions, 0 deletions

diff --git a/synapse/util/logutils.py b/synapse/util/logutils.py

index 86a41ddc8e..b94a749786 100644
--- a/synapse/util/logutils.py
+++ b/synapse/util/logutils.py
@@ -15,6 +15,7 @@
 
 
 from inspect import getcallargs
+from functools import wraps
 
 import logging
 import inspect
@@ -28,6 +29,7 @@ def log_function(f):
     lineno = f.func_code.co_firstlineno
     pathname = f.func_code.co_filename
 
+    @wraps(f)
     def wrapped(*args, **kwargs):
         name = f.__module__
         logger = logging.getLogger(name)