add a default logger service if done defined

Author: rande

ioc/component.py

@@ -188,6 +188,11 @@ def build_container(self, container):
 
         extensions = []
         container.add("service_container", container)
+
+        if not container.has('logger'):
+            import logging
+            container.add("logger", logging.getLogger('app'))
+
         self.parameters.set('ioc.extensions', self.extensions.keys())
 
         for name, config in self.extensions.items():

ioc/extra/tornado/command.py

@@ -3,8 +3,9 @@
 from tornado.httpserver import HTTPServer
 
 class StartCommand(Command):
-    def __init__(self, application, router):
+    def __init__(self, application, router, event_dispatcher):
         self.application = application
+        self.event_dispatcher = event_dispatcher
         self.router = router
 
     def initialize(self, parser):
@@ -15,6 +16,13 @@ def initialize(self, parser):
         parser.add_argument('--bind', '-b', default="localhost", type=str, help="bind the router to the provided named (default=localhost)")
 
     def execute(self, args, output):
+
+        output.write("Configuring tornado (event: ioc.extra.tornado.start)\n")
+
+        self.event_dispatcher.dispatch('ioc.extra.tornado.start', {
+            'application': self.application
+        })
+
         output.write("Starting tornado %s:%s\n" % (args.address, args.port))
 
         self.router.bind(args.bind)

ioc/extra/tornado/di.py

@@ -24,18 +24,29 @@ def post_load(self, container_builder):
         definition = container_builder.get('ioc.extra.tornado.asset_helper')
         definition.add_tag('jinja2.global', {'name': 'asset', 'method': 'generate_asset'})
 
-    def start(self, container):
-        application = container.get('ioc.extra.tornado.application')
+    def post_build(self, container_builder, container):
+        self.container = container
+
+        container.get('ioc.extra.event_dispatcher').add_listener('ioc.extra.tornado.start', self.configure_tornado)
+
+    def configure_tornado(self, event):
+
+        application = event.get('application')
+
+        self.container.get('logger').info("Attach RouterHandler")
+
         application.add_handlers(".*$", [
             ("/.*", RouterHandler, {
-                "router":           container.get('ioc.extra.tornado.router'),
-                "event_dispatcher": container.get('ioc.extra.event_dispatcher'),
-                "logger":           container.get('element.logger')
+                "router":           self.container.get('ioc.extra.tornado.router'),
+                "event_dispatcher": self.container.get('ioc.extra.event_dispatcher'),
+                "logger":           self.container.get('logger')
             })
         ])
 
+        self.container.get('logger').info("Attach StaticFileHandler")
+
         application.add_handlers(".*$", [
-            (container.parameters.get("ioc.extra.tornado.static_public_path") + "/(.*)", StaticFileHandler, {
-                "path": container.parameters.get("ioc.extra.tornado.static_folder")
+            (self.container.parameters.get("ioc.extra.tornado.static_public_path") + "/(.*)", StaticFileHandler, {
+                "path": self.container.parameters.get("ioc.extra.tornado.static_folder")
             })
         ])

ioc/extra/tornado/handler.py

@@ -70,6 +70,9 @@ def dispatch(self):
                 return
 
         except RequestRedirect, e:
+            if self.logger:
+                self.logger.debug("%s: redirect: %s" % (__name__, e.new_url))
+                
             self.redirect(e.new_url, True, 301)
             return
 
@@ -88,7 +91,8 @@ def dispatch(self):
             import traceback
             self.write("<pre>" + traceback.format_exc() + "</pre>")
 
-            print traceback.print_exc()
+            if self.logger:
+                self.logger.critical(traceback.print_exc())
 
             self.event_dispatcher.dispatch('handler.exception', {
                 'request_handler': self,

ioc/extra/tornado/resources/config/services.yml

@@ -23,6 +23,7 @@ services:
         arguments:
             - '@ioc.extra.tornado.application'
             - '@ioc.extra.tornado.router'
+            - '@ioc.extra.event_dispatcher'
 
         tags:
             command:

tests/ioc/test_component.py

@@ -171,7 +171,7 @@ def test_get_container(self):
 
         self.container.build_container(container)
 
-        self.assertEquals(4, len(container.services))
+        self.assertEquals(5, len(container.services))
         self.assertTrue(container.has('service.id.2'))
         self.assertIsInstance(container.get('service.id.2'), tests.ioc.service.Fake)
         self.assertIsInstance(container.get('service.id.3'), tests.ioc.service.Foo)
@@ -238,7 +238,7 @@ def test_abstracted_service_not_in_the_container(self):
 
         self.container.build_container(container)
 
-        self.assertEquals(1, len(container.services))
+        self.assertEquals(2, len(container.services))
 
     def test_create_definition_from_abstract_definition(self):
         self.container.add('service.id.abstract', ioc.component.Definition('tests.ioc.service.Fake', ['foo'], abstract=True))
@@ -248,4 +248,4 @@ def test_create_definition_from_abstract_definition(self):
         self.container.add('service.id.1', definition)
 
         container = self.container.build_container(ioc.component.Container())
-        self.assertEquals(2, len(container.services))
+        self.assertEquals(3, len(container.services))

tests/ioc/test_helper.py

@@ -13,7 +13,7 @@ def test_build(self):
             "%s/../fixtures/services.yml" % current_dir
         ], parameters={'inline': 'parameter'})
 
-        self.assertEquals(5, len(container.services))
+        self.assertEquals(6, len(container.services))
         self.assertEquals(container.get('foo').fake, container.get('fake'))
         self.assertEquals('argument 1', container.get('fake').mandatory)