From 7617d9bd3a3f9086806cb706ac06745833f418ba Mon Sep 17 00:00:00 2001
From: Florian Mounier <florian.mounier@kozea.fr>
Date: Fri, 13 Dec 2013 11:17:51 +0100
Subject: [PATCH] Fix log

---
 app/routes.py            |  1 +
 app/templates/_ie.jinja2 |  3 ---
 requirements-dev.txt     |  1 +
 serve.py                 | 22 ++++++++--------------
 4 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/app/routes.py b/app/routes.py
index f8f01c4..a174ece 100644
--- a/app/routes.py
+++ b/app/routes.py
@@ -5,3 +5,4 @@ from flask import render_template
 @app.route("/")
 def index():
     return render_template('index.jinja2')
+
diff --git a/app/templates/_ie.jinja2 b/app/templates/_ie.jinja2
index 76e440b..1169812 100644
--- a/app/templates/_ie.jinja2
+++ b/app/templates/_ie.jinja2
@@ -1,6 +1,3 @@
-<!-- Just for debugging purposes. Don't actually copy this line! -->
-<!--[if lt IE 9]><script src="http://getbootstrap.com/docs-assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
-
 <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
 <!--[if lt IE 9]>
   <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
diff --git a/requirements-dev.txt b/requirements-dev.txt
index e6ad67f..00924e5 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,3 +1,4 @@
 wdb
 log_colorizer
 wsreload
+cutter
diff --git a/serve.py b/serve.py
index 0909789..fd220ae 100644
--- a/serve.py
+++ b/serve.py
@@ -1,4 +1,9 @@
 import logging
+try:
+    from log_colorizer import make_colored_stream_handler
+    logging.root.handlers = [make_colored_stream_handler()]
+except ImportError:
+    print('log colorizer not found')
 
 host = 'apparatus.l'
 port = 2001
@@ -11,22 +16,11 @@ except ImportError:
     pass
 
 from app import app
-try:
-    from log_colorizer import make_colored_stream_handler
-    handler = make_colored_stream_handler()
-    handler.setLevel(logging.DEBUG)
+app.logger.setLevel(logging.DEBUG)
 
-    del app.logger.handlers[:]
-    app.logger.addHandler(handler)
-    app.logger.setLevel(logging.DEBUG)
+del app.logger.handlers[:]
+logging.getLogger('werkzeug').setLevel(logging.DEBUG)
 
-    import werkzeug
-    werkzeug._internal._log(
-        'debug', 'Need to log something before deleting handler -_-')
-    del logging.getLogger('werkzeug').handlers[:]
-    logging.getLogger('werkzeug').addHandler(handler)
-except:
-    print('log colorizer not found')
 
 werkzeug_debugger = True
 try: