Merge lp:~facundo/uservice-logging/log-level into lp:uservice-logging

[Facundo Batista]

Allow to pass the logging level.

Allow to pass the logging level.

[Celso Providelo (cprov)]

Facundo,

Looks good, but I confess I do not remember (not is it mentioned on the card) what is the use case for setting specific log levels.

That would determine the services/application needing a new release of uservice-logging.

review: Approve

[lp:~facundo/uservice-logging/log-level]

29. By Facundo Batista on 2015-09-29

Allow to pass level in configure_logging.

[Facundo Batista (facundo)]

Added possibility of passing the log level in other entry point.

review: Approve

=== modified file 'uservice_logging/logging.py'
--- uservice_logging/logging.py	2015-09-01 23:29:49 +0000
+++ uservice_logging/logging.py	2015-09-29 12:30:07 +0000
@@ -54,7 +54,7 @@
     return dumped.encode('utf8')
 
 
-def configure_logging(config, service, **kwds):
+def configure_logging(config, service, level=logging.INFO, **kwds):
     """Simplified setup for the micro-service logging.
 
     If present config['logstash'] is used to setup logstash (see
@@ -85,10 +85,10 @@
     logstash_config = None
     if 'logstash' in config:
         logstash_config = config['logstash']
-    return configure_service_logging(log_path, logstash_config)
-
-
-def configure_service_logging(log_file_path=None, logstash_config=None):
+    return configure_service_logging(log_path, logstash_config, level)
+
+
+def configure_service_logging(log_file_path=None, logstash_config=None, level=logging.INFO):
     """Configure python's logging for the micro-service.
 
     This function sets a standard level of logging for all our services. The
@@ -103,10 +103,11 @@
         logging to stderr instead of the file.
     :param logstash_config: If specified, must be a mapping type that contains
         the keys 'host', 'port', and 'version'.
+    :param level: The logger level (default to INFO).
 
     """
     root_logger = logging.getLogger()
-    root_logger.setLevel(logging.INFO)
+    root_logger.setLevel(level)
 
     # Silence requests logging, which is created by nova, keystone and swift.
     requests_logger = logging.getLogger('requests')

=== modified file 'uservice_logging/tests/test_logging.py'
--- uservice_logging/tests/test_logging.py	2015-08-20 16:48:42 +0000
+++ uservice_logging/tests/test_logging.py	2015-09-29 12:30:07 +0000
@@ -193,6 +193,40 @@
                 FileContains(matcher=Contains("Hello World"))
             )
 
+    def test__configure_service_logging__log_level(self):
+        with tempfile.TemporaryDirectory() as run_dir:
+            rc, out, err = self.run_script(
+                dedent(
+                    """
+                    import logging
+                    from uservice_logging.logging import configure_service_logging
+
+                    configure_service_logging(level=logging.DEBUG)
+                    logging.debug("Hello World")
+                    """
+                ),
+                run_dir
+            )
+            self.expectThat(rc, Equals(0))
+            self.expectThat(err, Contains("Hello World"))
+
+    def test__configure_logging__log_level(self):
+        with tempfile.TemporaryDirectory() as run_dir:
+            rc, out, err = self.run_script(
+                dedent(
+                    """
+                    import logging
+                    from uservice_logging.logging import configure_logging
+
+                    configure_logging(dict(), 'svc', logging.DEBUG)
+                    logging.debug("Hello World")
+                    """
+                ),
+                run_dir
+            )
+            self.expectThat(rc, Equals(0))
+            self.expectThat(err, Contains("Hello World"))
+
 
 class LoggerClassFixture(Fixture):