Skip to content
Browse files

Changed logic for debug level log settings

  • Loading branch information...
1 parent 583c5f7 commit 61a95196ac28771466ada43a1c01effda42040a5 @mitsuhiko committed
Showing with 12 additions and 1 deletion.
  1. +2 −0 CHANGES
  2. +3 −1 flask/logging.py
  3. +7 −0 flask/testsuite/helpers.py
View
2 CHANGES
@@ -10,6 +10,8 @@ Relase date to be decided, codename to be chosen.
- The :func:`flask.url_for` function now can generate anchors to the
generated links.
+- Logger now only returns the debug log setting if it was not set
+ explicitly.
Version 0.8.1
-------------
View
4 flask/logging.py
@@ -25,7 +25,9 @@ def create_logger(app):
class DebugLogger(Logger):
def getEffectiveLevel(x):
- return DEBUG if app.debug else Logger.getEffectiveLevel(x)
+ if x.level == 0 and app.debug:
+ return DEBUG
+ return Logger.getEffectiveLevel(x)
class DebugHandler(StreamHandler):
def emit(x, record):
View
7 flask/testsuite/helpers.py
@@ -246,6 +246,13 @@ def exc():
else:
self.assert_(False, 'debug log ate the exception')
+ def test_debug_log_override(self):
+ app = flask.Flask(__name__)
+ app.debug = True
+ app.logger_name = 'flask_tests/test_debug_log_override'
+ app.logger.level = 10
+ self.assert_equal(app.logger.level, 10)
+
def test_exception_logging(self):
out = StringIO()
app = flask.Flask(__name__)

0 comments on commit 61a9519

Please sign in to comment.
Something went wrong with that request. Please try again.