web: Move 404 handler into an own file

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/Makefile.am b/Makefile.am
index 01bda2eed3c66e331b7569df2efe9b21f9bdf689..f01eaaceb6fa56ed758b653f061fd26975ef53de 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -124,6 +124,7 @@ hubdir = $(buildservicedir)/hub
 web_PYTHON = \
        src/web/__init__.py \
        src/web/base.py \
+       src/web/errors.py \
        src/web/handlers.py \
        src/web/handlers_api.py \
        src/web/handlers_auth.py \

diff --git a/src/web/__init__.py b/src/web/__init__.py
index 9b3b9b3ff2a607a8ec0878e9e1186ef6210cc06e..01425ba9f904e03d19441c98b89468f6fde891c3 100644 (file)
--- a/src/web/__init__.py
+++ b/src/web/__init__.py
@@ -16,6 +16,7 @@ from ..decorators import *
 from .handlers import *
 
 from . import handlers_api
+from . import errors
 from . import mirrors
 from . import ui_modules
 
@@ -233,7 +234,7 @@ class Application(tornado.web.Application):
 
                        # API handlers
                        (r"/api/packages/autocomplete", handlers_api.ApiPackagesAutocomplete),
-               ], **settings)
+               ], default_handler_class=errors.Error404Handler, **settings)
 
                logging.info("Successfully initialied application")
 

diff --git a/src/web/errors.py b/src/web/errors.py
new file mode 100644 (file)
index 0000000..0a47fb1
--- /dev/null
+++ b/src/web/errors.py
@@ -0,0 +1,9 @@
+#!/usr/bin/python
+
+import tornado.web
+
+from . import base
+
+class Error404Handler(base.BaseHandler):
+       def prepare(self):
+               raise tornado.web.HTTPError(404)

diff --git a/src/web/handlers.py b/src/web/handlers.py
index 50b298a99f90dfd0ffbdb48a12892c6be67f0e5a..dc8803bc0570c474be579bbebb23bcb08cc0203c 100644 (file)
--- a/src/web/handlers.py
+++ b/src/web/handlers.py
@@ -33,11 +33,6 @@ class IndexHandler(base.BaseHandler):
                self.render("index.html", jobs=jobs, updates=updates)
 
 
-class Error404Handler(base.BaseHandler):
-       def get(self):
-               raise tornado.web.HTTPError(404)
-
-
 class UploadsHandler(base.BaseHandler):
        @tornado.web.authenticated
        def get(self):