summaryrefslogtreecommitdiff
path: root/service/pixelated/resources/login_resource.py
diff options
context:
space:
mode:
authorRoald de Vries <rdevries@thoughtworks.com>2016-12-05 17:49:47 +0100
committerRoald de Vries <rdevries@thoughtworks.com>2016-12-05 17:49:47 +0100
commitdb611f3737442583ab2a07f75fbec74d827a2ff5 (patch)
tree012cb28a4345c66def2803e3f9cfcf0aee593d6b /service/pixelated/resources/login_resource.py
parent3303510d3dabc4c1efdf39c52db026229d909490 (diff)
parent0dd71ff7c3a895e774205231c23720ee7313ad39 (diff)
Merge branch 'master' into signup
Diffstat (limited to 'service/pixelated/resources/login_resource.py')
-rw-r--r--service/pixelated/resources/login_resource.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/service/pixelated/resources/login_resource.py b/service/pixelated/resources/login_resource.py
index 5838003a..9bb771df 100644
--- a/service/pixelated/resources/login_resource.py
+++ b/service/pixelated/resources/login_resource.py
@@ -133,10 +133,10 @@ class LoginResource(BaseResource):
self._complete_bootstrap(user_auth, request)
def render_error(error):
- log.info('Login Error for %s' % request.args['username'][0])
+ log.info('Login error for %s' % request.args['username'][0])
log.info('%s' % error)
request.setResponseCode(UNAUTHORIZED)
- return self._render_template(request, 'Invalid credentials')
+ return self._render_template(request, 'Invalid username or password')
d = self._handle_login(request)
d.addCallbacks(render_response, render_error)