diff options
| author | Erik Johnston <erik@matrix.org> | 2014-11-26 12:06:36 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-11-26 12:06:36 +0000 |
| commit | 48ee9ddb22b36f1adc23290e76287a922488596d (patch) | |
| tree | d9eccedd90f9c573634c5456cfbbb65684214c6e /synapse/api/errors.py | |
| parent | Use tagged version of matrix-angular-sdk (diff) | |
| parent | Bump version numbers and change log (diff) | |
| download | synapse-48ee9ddb22b36f1adc23290e76287a922488596d.tar.xz | |
Merge branch 'release-v0.5.1' of github.com:matrix-org/synapse v0.5.1
Diffstat (limited to 'synapse/api/errors.py')
| -rw-r--r-- | synapse/api/errors.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/synapse/api/errors.py b/synapse/api/errors.py index 33d15072af..581439ceb3 100644 --- a/synapse/api/errors.py +++ b/synapse/api/errors.py @@ -17,6 +17,8 @@ import logging +logger = logging.getLogger(__name__) + class Codes(object): UNAUTHORIZED = "M_UNAUTHORIZED" @@ -38,7 +40,7 @@ class CodeMessageException(Exception): """An exception with integer code and message string attributes.""" def __init__(self, code, msg): - logging.error("%s: %s, %s", type(self).__name__, code, msg) + logger.info("%s: %s, %s", type(self).__name__, code, msg) super(CodeMessageException, self).__init__("%d: %s" % (code, msg)) self.code = code self.msg = msg @@ -140,7 +142,8 @@ def cs_exception(exception): if isinstance(exception, CodeMessageException): return exception.error_dict() else: - logging.error("Unknown exception type: %s", type(exception)) + logger.error("Unknown exception type: %s", type(exception)) + return {} def cs_error(msg, code=Codes.UNKNOWN, **kwargs): |