# HG changeset patch # User Marcin Kuzminski # Date 2011-03-27 00:23:44 # Node ID 8c0a57a4b89beec9617866dd76c7a85d2ee626a4 # Parent 228622715ee9aaac59ccb22114dc5c141790e24c Journal Should not return 500 errors on failure, rather better is to return bad request error diff --git a/rhodecode/controllers/journal.py b/rhodecode/controllers/journal.py --- a/rhodecode/controllers/journal.py +++ b/rhodecode/controllers/journal.py @@ -31,7 +31,7 @@ from sqlalchemy.orm import joinedload, m from webhelpers.paginate import Page from itertools import groupby -from paste.httpexceptions import HTTPInternalServerError +from paste.httpexceptions import HTTPBadRequest from pylons import request, tmpl_context as c, response, url from pylons.i18n.translation import _ from webhelpers.feedgenerator import Atom1Feed, Rss201rev2Feed @@ -132,7 +132,7 @@ class JournalController(BaseController): self.rhodecode_user.user_id) return 'ok' except: - raise HTTPInternalServerError() + raise HTTPBadRequest() repo_id = request.POST.get('follows_repo_id') if repo_id: @@ -141,11 +141,11 @@ class JournalController(BaseController): self.rhodecode_user.user_id) return 'ok' except: - raise HTTPInternalServerError() + raise HTTPBadRequest() log.debug('token mismatch %s vs %s', cur_token, token) - raise HTTPInternalServerError() + raise HTTPBadRequest()