diff options
| author | Erik Johnston <erik@matrix.org> | 2014-08-28 16:52:46 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-08-28 16:52:46 +0100 |
| commit | 54d0a755734f71e38c5cdc0e922422cc4d31ad74 (patch) | |
| tree | 4d0256be69f304553d0efaa71ec50498f3821683 /synapse/util/logutils.py | |
| parent | Up timeout to 10 minutes (diff) | |
| parent | Only send presence "poll"/"unpoll" EDUs when changing from/to zero remotes (diff) | |
| download | synapse-54d0a755734f71e38c5cdc0e922422cc4d31ad74.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into presence_logging
Conflicts: synapse/handlers/presence.py
Diffstat (limited to 'synapse/util/logutils.py')
| -rw-r--r-- | synapse/util/logutils.py | 2 |
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) |