diff options
| author | Erik Johnston <erik@matrix.org> | 2014-11-03 10:17:37 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-11-03 10:17:37 +0000 |
| commit | 7a07263281c89f199aa2ee8a1c9e602e7a5b1218 (patch) | |
| tree | 4fb96db62c91009db5928a31570107ad29841b61 /synapse | |
| parent | Sign evnets (diff) | |
| parent | Use python logger, not the twisted logger (diff) | |
| download | synapse-7a07263281c89f199aa2ee8a1c9e602e7a5b1218.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into federation_authorization
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/__init__.py | 2 | ||||
| -rw-r--r-- | synapse/handlers/register.py | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py index 7067188c5b..23ae5f003f 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -16,4 +16,4 @@ """ This is a reference implementation of a synapse home server. """ -__version__ = "0.4.1" +__version__ = "0.4.2" diff --git a/synapse/handlers/register.py b/synapse/handlers/register.py index 88eb51a8ed..7df9d9b82d 100644 --- a/synapse/handlers/register.py +++ b/synapse/handlers/register.py @@ -15,7 +15,6 @@ """Contains functions for registering clients.""" from twisted.internet import defer -from twisted.python import log from synapse.types import UserID from synapse.api.errors import ( @@ -129,7 +128,7 @@ class RegistrationHandler(BaseHandler): try: threepid = yield self._threepid_from_creds(c) except: - log.err() + logger.exception("Couldn't validate 3pid") raise RegistrationError(400, "Couldn't validate 3pid") if not threepid: |