diff options
| author | Roald de Vries <rdevries@thoughtworks.com> | 2016-11-29 15:05:34 +0100 |
|---|---|---|
| committer | Roald de Vries <rdevries@thoughtworks.com> | 2016-11-29 15:05:34 +0100 |
| commit | 1ba7abb6098ffba76ab7ed85e491dc060c5c4520 (patch) | |
| tree | 4ca227c563bd2580bb0d4d77e0f516ea6fa28e0a /service/pixelated | |
| parent | cec3cbf731f0e56cb96de27a070bdaf72e985eb0 (diff) | |
| parent | 0d293fad65d90b43016c21a851df100aebbf46cb (diff) | |
Merge branch 'master' into signup
Diffstat (limited to 'service/pixelated')
| -rw-r--r-- | service/pixelated/maintenance.py | 3 | ||||
| -rw-r--r-- | service/pixelated/resources/login_resource.py | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/service/pixelated/maintenance.py b/service/pixelated/maintenance.py index 74b5a369..a2286034 100644 --- a/service/pixelated/maintenance.py +++ b/service/pixelated/maintenance.py @@ -105,7 +105,8 @@ def add_command_callback(args, prepareDeferred, finalizeDeferred): prepareDeferred.addCallback(load_mails, args.file) prepareDeferred.addCallback(flush_to_soledad, finalizeDeferred) elif args.command == 'markov-generate': - prepareDeferred.addCallback(markov_generate, args.file, int(args.limit), args.seed) + prepareDeferred.addCallback( + markov_generate, args.file, int(args.limit), args.seed) prepareDeferred.addCallback(flush_to_soledad, finalizeDeferred) elif args.command == 'dump-soledad': prepareDeferred.addCallback(dump_soledad) diff --git a/service/pixelated/resources/login_resource.py b/service/pixelated/resources/login_resource.py index 905b872c..fec4307e 100644 --- a/service/pixelated/resources/login_resource.py +++ b/service/pixelated/resources/login_resource.py @@ -178,7 +178,7 @@ class LoginResource(BaseResource): def _complete_bootstrap(self, user_auth, request): def log_error(error): - log.error('Login error during %s services setup: %s' % (user_auth.username, error.getErrorMessage())) + log.error('Login error during %s services setup: %s \n %s' % (user_auth.username, error.getErrorMessage(), error.getTraceback())) def set_session_cookies(_): session = IPixelatedSession(request.getSession()) |