Version bump

Fix tox environment list

.travis.yml

@@ -1,12 +1,11 @@
 language: python
 python:
-    - "3.5"
+    - "3.6"
 sudo: false
 env:
     - TOXENV=py27
-    - TOXENV=py33
     - TOXENV=py34
-    - TOXENV=py35
+    - TOXENV=py36
 install:
     - pip install -U pip
     - pip install -U Flask tox coverage codecov

flask_logging_extras/__init__.py

@@ -32,7 +32,7 @@ no value is present in the message record.
 
 import logging
 
-from flask import has_request_context, request
+from flask import has_request_context, request, current_app, has_app_context
 
 __version_info__ = ('0', '0', '1')
 __version__ = '.'.join(__version_info__)
@@ -121,14 +121,21 @@ class FlaskExtraLogger(logging.getLoggerClass()):
                 del(kwargs['app'])
 
         self.app = None
-        self._valid_keywords = []
+        self._valid_keywords = {}
         self._blueprint_var = None
         self._blueprint_app = None
         self._blueprint_norequest = None
 
         super(FlaskExtraLogger, self).__init__(*args, **kwargs)
 
+        if hasattr(self.__class__, '__default_config__'):
+            self.config = self.__class__.__default_config__
+            self.init_from_config()
+
     def _log(self, *args, **kwargs):
+        if has_app_context() and self.app is None:
+            self.init_app(current_app)
+
         if 'extra' not in kwargs:
             kwargs['extra'] = {}
 
@@ -155,6 +162,42 @@ class FlaskExtraLogger(logging.getLoggerClass()):
                 'reserved for internal use.'
                 .format(keyword=word))
 
+    def init_from_config(self):
+        """Intialize the logger class from a Flask config dict
+
+        The class reads its necessary configuration from the config provided.
+
+        If the application doesn’t call this, or doesn’t have the `FLASK_LOGGING_EXTRAS_KEYWORDS`
+        in its config, no extra functionality will be added.
+
+        :raises ValueError: if the app tries to register a keyword that is
+                             reserved for internal use
+
+        """
+
+        if not isinstance(self.config, dict):
+            self.config = {
+                'FLASK_LOGGING_EXTRAS_KEYWORDS': getattr(self.config, 'FLASK_LOGGING_EXTRAS_KEYWORDS', {}),
+                'FLASK_LOGGING_EXTRAS_BLUEPRINT': getattr(self.config, 'FLASK_LOGGING_EXTRAS_BLUEPRINT', (None, '<app>', '<not a request>',)),
+            }
+
+        self.config.setdefault('FLASK_LOGGING_EXTRAS_KEYWORDS', {})
+        self.config.setdefault('FLASK_LOGGING_EXTRAS_BLUEPRINT',
+                               (None, '<app>', '<not a request>'))
+
+        for kw in self.config['FLASK_LOGGING_EXTRAS_KEYWORDS']:
+            self._check_reserved_word(kw)
+
+        self._check_reserved_word(
+            self.config['FLASK_LOGGING_EXTRAS_BLUEPRINT'][0])
+
+        self._valid_keywords = self.config['FLASK_LOGGING_EXTRAS_KEYWORDS']
+        (
+            self._blueprint_var,
+            self._blueprint_app,
+            self._blueprint_norequest,
+        ) = self.config['FLASK_LOGGING_EXTRAS_BLUEPRINT']
+
     def init_app(self, app):
         """
         Intialize the logger class with a Flask application
@@ -172,25 +215,12 @@ class FlaskExtraLogger(logging.getLoggerClass()):
                              reserved for internal use
         """
 
-        app.config.setdefault('FLASK_LOGGING_EXTRAS_KEYWORDS', {})
+        self.app = app
-        app.config.setdefault('FLASK_LOGGING_EXTRAS_BLUEPRINT',
+        self.config = app.config
-                              (None, '<app>', '<not a request>'))
+        self.init_from_config()
-
-        for kw in app.config['FLASK_LOGGING_EXTRAS_KEYWORDS']:
-            self._check_reserved_word(kw)
-
-        self._check_reserved_word(
-            app.config['FLASK_LOGGING_EXTRAS_BLUEPRINT'][0])
-
-        self._valid_keywords = app.config['FLASK_LOGGING_EXTRAS_KEYWORDS']
-        (
-            self._blueprint_var,
-            self._blueprint_app,
-            self._blueprint_norequest,
-        ) = app.config['FLASK_LOGGING_EXTRAS_BLUEPRINT']
 
 
-def register_logger_class(cls=FlaskExtraLogger):
+def register_logger_class(cls=FlaskExtraLogger, config=None):
     """
     Register a new logger class
 
@@ -219,5 +249,6 @@ def register_logger_class(cls=FlaskExtraLogger):
 
     old_class = logging.getLoggerClass()
     logging.setLoggerClass(cls)
+    cls.__default_config__ = config
 
     return old_class

setup.py

@@ -8,7 +8,7 @@ Flask-Logging-Extras provides extra logging functionality for Flask apps.
 from setuptools import setup
 
 setup(name='Flask-Logging-Extras',
-      version='0.1.0',
+      version='0.2.0',
       url='https://github.com/gergelypolonkai/flask-logging-extras',
       license='MIT',
       author='Gergely Polonkai',

tests/test_logger_keywords.py

@@ -191,10 +191,10 @@ class LoggerBlueprintTestCase(TestCase):
         self.stream = ListStream()
 
         formatter = logging.Formatter(fmt)
-        handler = TestingStreamHandler(stream=self.stream)
+        self.handler = TestingStreamHandler(stream=self.stream)
-        handler.setLevel(logging.DEBUG)
+        self.handler.setLevel(logging.DEBUG)
-        handler.setFormatter(formatter)
+        self.handler.setFormatter(formatter)
-        app.logger.addHandler(handler)
+        app.logger.addHandler(self.handler)
         app.logger.setLevel(logging.DEBUG)
 
         bp = Blueprint('test_blueprint', 'test_bpg13')
@@ -218,6 +218,15 @@ class LoggerBlueprintTestCase(TestCase):
     def tearDown(self):
         logging.setLoggerClass(self.original_logger_class)
 
+    def test_autoconfig(self):
+        logger = logging.getLogger('test')
+        logger.addHandler(self.handler)
+
+        with self.app.app_context():
+            logger.warning('Hello')
+
+        self.assertEqual('<norequest> Hello\n', self.stream.lines[-1])
+
     def test_request_log(self):
         self.client.get('/app')
         self.assertEqual('<app> Message\n', self.stream.lines[-1])

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py27, py33, py34, py35, py36
+envlist = py27, py34, py36
 
 [testenv]
 commands =