Issue #431: extractes the generic handling for error callbacks in init and handles login, logout, mail and tags resources

1 files changed, 16 insertions, 11 deletions

diff --git a/service/pixelated/resources/logout_resource.py b/service/pixelated/resources/logout_resource.py
index e26ec4b2..c22815ce 100644
--- a/service/pixelated/resources/logout_resource.py
+++ b/service/pixelated/resources/logout_resource.py
@@ -1,15 +1,26 @@
-import logging
+#
+# Copyright (c) 2014 ThoughtWorks, Inc.
+#
+# Pixelated is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Pixelated is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
 
 from twisted.internet import defer
 from twisted.web import util
-from twisted.web.http import INTERNAL_SERVER_ERROR
 from twisted.web.server import NOT_DONE_YET
 
 from pixelated.resources import BaseResource
 from pixelated.resources.login_resource import LoginResource
 
-log = logging.getLogger(__name__)
-
 
 class LogoutResource(BaseResource):
     BASE_URL = "logout"
@@ -27,14 +38,8 @@ class LogoutResource(BaseResource):
             request.write(content)
             request.finish()
 
-        def handle_error(e):
-            log.error(e)
-            request.setResponseCode(INTERNAL_SERVER_ERROR)
-            request.write('Something went wrong!')
-            request.finish()
-
         d = self._execute_logout(request)
         d.addCallback(_redirect_to_login)
-        d.addErrback(handle_error)
+        d.addErrback(self.generic_error_handling, request)
 
         return NOT_DONE_YET