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

Conflicts:
	synapse/handlers/presence.py
This commit is contained in:
Erik Johnston 2014-08-28 16:52:46 +01:00
commit 54d0a75573
20 changed files with 495 additions and 301 deletions

View file

@ -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)