diff options
author | Mark Haines <mark.haines@matrix.org> | 2014-10-30 11:13:58 +0000 |
---|---|---|
committer | Mark Haines <mark.haines@matrix.org> | 2014-10-30 11:13:58 +0000 |
commit | 7c063995123297dfd569f68e0f195cad7fa327c5 (patch) | |
tree | 2ce0eb2215707808c689ac9ea9787fff8a9c7664 /synapse/handlers/login.py | |
parent | Pep8 and a few doc strings (diff) | |
parent | Fix pep8 warnings (diff) | |
download | synapse-7c063995123297dfd569f68e0f195cad7fa327c5.tar.xz |
Merge branch 'develop' into request_logging
Conflicts: synapse/config/logger.py
Diffstat (limited to 'synapse/handlers/login.py')
-rw-r--r-- | synapse/handlers/login.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/login.py b/synapse/handlers/login.py index 3f152e18f0..99d15261d4 100644 --- a/synapse/handlers/login.py +++ b/synapse/handlers/login.py @@ -54,7 +54,7 @@ class LoginHandler(BaseHandler): # pull out the hash for this user if they exist user_info = yield self.store.get_user_by_id(user_id=user) if not user_info: - logger.warn("Attempted to login as %s but they do not exist.", user) + logger.warn("Attempted to login as %s but they do not exist", user) raise LoginError(403, "", errcode=Codes.FORBIDDEN) stored_hash = user_info[0]["password_hash"] |