Merge branch 'master' of git://git.ipfire.org/pbs

[people/jschlag/pbs.git] / src / hub / __init__.py

diff --git a/src/hub/__init__.py b/src/hub/__init__.py
index 0df68a5a911ed0b782e8bb9633f237bf69c7bb50..e7b7391d14c0770e7cabc29458c308ddbd1b5d41 100644 (file)
--- a/src/hub/__init__.py
+++ b/src/hub/__init__.py
@@ -8,6 +8,7 @@ import tornado.options
 import tornado.web
 
 from .. import Backend
+from ..decorators import *
 
 from . import handlers
 
@@ -17,19 +18,12 @@ tornado.options.parse_command_line()
 
 class Application(tornado.web.Application):
        def __init__(self):
-               self.__pakfire = None
-
                settings = dict(
                        debug = tornado.options.options.debug,
                        gzip  = True,
                )
 
-               # Load translations.
-               tornado.locale.load_gettext_translations(LOCALEDIR, PACKAGE_NAME)
-
-               tornado.web.Application.__init__(self, **settings)
-
-               self.add_handlers(r"pakfirehub.ipfire.org", [
+               tornado.web.Application.__init__(self, [
                        # Redirect strayed users.
                        #(r"/", handlers.RedirectHandler),
 
@@ -64,16 +58,13 @@ class Application(tornado.web.Application):
                        (r"/uploads/(.*)/sendchunk", handlers.UploadsSendChunkHandler),
                        (r"/uploads/(.*)/finished", handlers.UploadsFinishedHandler),
                        (r"/uploads/(.*)/destroy", handlers.UploadsDestroyHandler),
-               ])
+               ], **settings)
 
                logging.info("Successfully initialied application")
 
-       @property
-       def pakfire(self):
-               if self.__pakfire is None:
-                       self.__pakfire = Backend()
-
-               return self.__pakfire
+       @lazy_property
+       def backend(self):
+               return Backend()
 
        def __del__(self):
                logging.info("Shutting down application")