Merge remote-tracking branch 'origin/develop' into develop

Author: Frédéric Mohier

alignak/daemon.py

@@ -659,6 +659,10 @@ def __init__(self, name, **kwargs):
                 self.log_cherrypy = None
             self.log_filename = ''
 
+        # Log level...
+        if 'log_level' in kwargs and kwargs['log_level']:
+            self.log_level = PathProp().pythonize(kwargs['log_level'].strip())
+
         # pid file is stored in the working directory
         self.pid = os.getpid()
         self.pid_filename = PathProp().pythonize("%s.pid" % self.name)
@@ -1751,12 +1755,21 @@ def get_header(self, configuration=False):
         :return: A string list containing project name, daemon name, version, licence etc.
         :rtype: list
         """
-        header = ["-----",
-                  "Alignak %s - %s daemon" % (VERSION, self.name),
-                  "Copyright (c) 2015-2018: Alignak Team",
-                  "License: AGPL",
-                  "-----",
-                  "My pid: %s" % self.pid]
+        header = [u"-----",
+                  u"   █████╗ ██╗     ██╗ ██████╗ ███╗   ██╗ █████╗ ██╗  ██╗",
+                  u"  ██╔══██╗██║     ██║██╔════╝ ████╗  ██║██╔══██╗██║ ██╔╝",
+                  u"  ███████║██║     ██║██║  ███╗██╔██╗ ██║███████║█████╔╝ ",
+                  u"  ██╔══██║██║     ██║██║   ██║██║╚██╗██║██╔══██║██╔═██╗ ",
+                  u"  ██║  ██║███████╗██║╚██████╔╝██║ ╚████║██║  ██║██║  ██╗",
+                  u"  ╚═╝  ╚═╝╚══════╝╚═╝ ╚═════╝ ╚═╝  ╚═══╝╚═╝  ╚═╝╚═╝  ╚═╝",
+                  u"-----",
+                  u"Alignak %s - %s daemon" % (VERSION, self.name),
+                  u"Copyright (c) 2015-2019: Alignak Team",
+                  u"License: AGPL",
+                  u"-----",
+                  u"Python: %s.%s" % (sys.version_info.major, sys.version_info.minor),
+                  u"-----",
+                  u"My pid: %s" % self.pid]
 
         if configuration:
             header = ["My configuration: "]
@@ -2185,6 +2198,12 @@ def setup_alignak_logger(self):
                 logger.info("-----")
                 logger.info("Daemon log level set to a minimum of INFO")
                 logger.info("-----")
+            elif self.log_level:
+                # Force the global logger at provided level
+                set_log_level(self.log_level)
+                logger.info("-----")
+                logger.info("Daemon log level set to %s", self.log_level)
+                logger.info("-----")
         except Exception as exp:  # pylint: disable=broad-except
             print("***** %s - exception when setting-up the logger: %s" % (self.name, exp))
             self.exit_on_exception(exp, message="Logger configuration error!")

alignak/util.py

@@ -1330,6 +1330,10 @@ def parse_daemon_args(arbiter=False):
     parser.add_argument('-l', '--log_file', dest='log_filename',
                         help='File used for the daemon log. Set as empty to disable log file.')
 
+    parser.add_argument('-Lm', '--log_level', dest='log_level',
+                        help='Log level: DEBUG, INFO, WARNING, ERROR or CRITICAL. '
+                             'Overrides the -v and -vv options.')
+
     parser.add_argument('-i', '--pid_file', dest='pid_filename',
                         help='File used to store the daemon pid')
 

alignak/version.py

@@ -2,4 +2,4 @@
 This module provide Alignak current version
 """
 
-VERSION = "2.1.3"
+VERSION = "2.1.5"

docker/docker-compose.yml

@@ -51,4 +51,6 @@ docopt
 # Use psutil for daemons memory monitoring (env ALIGNAK_DAEMONS_MONITORING)
 # Use psutil for scheduler ALIGNAK_LOG_MONITORING
 # Use psutil for launching daemons from the Arbiter
+# Uncomment or `pip install psutil` to enable the concerned features
+# Note that psutil requires to be compiled: sudo apt-get install gcc python3-dev
 psutil>=5.4.3,<=5.4.5

requirements.txt

@@ -52,6 +52,7 @@
 
 
 import os
+import sys
 import time
 import socket
 import tempfile
@@ -397,14 +398,23 @@ def test_daemon_header(self):
         """
         daemon = self.get_daemon()
         expected_result = [
-            "-----",
-            "Alignak %s - %s daemon" % (VERSION, daemon.name),
-            "Copyright (c) 2015-2018: Alignak Team",
-            "License: AGPL",
-            "-----",
-            "My pid: %s" % daemon.pid
+            u"-----",
+            u"   █████╗ ██╗     ██╗ ██████╗ ███╗   ██╗ █████╗ ██╗  ██╗",
+            u"  ██╔══██╗██║     ██║██╔════╝ ████╗  ██║██╔══██╗██║ ██╔╝",
+            u"  ███████║██║     ██║██║  ███╗██╔██╗ ██║███████║█████╔╝ ",
+            u"  ██╔══██║██║     ██║██║   ██║██║╚██╗██║██╔══██║██╔═██╗ ",
+            u"  ██║  ██║███████╗██║╚██████╔╝██║ ╚████║██║  ██║██║  ██╗",
+            u"  ╚═╝  ╚═╝╚══════╝╚═╝ ╚═════╝ ╚═╝  ╚═══╝╚═╝  ╚═╝╚═╝  ╚═╝",
+            u"-----",
+            u"Alignak %s - %s daemon" % (VERSION, daemon.name),
+            u"Copyright (c) 2015-2019: Alignak Team",
+            u"License: AGPL",
+            u"-----",
+            u"Python: %s.%s" % (sys.version_info.major, sys.version_info.minor),
+            u"-----",
+            u"My pid: %s" % daemon.pid
         ]
-        assert daemon.get_header()[:7] == expected_result
+        assert daemon.get_header()[:15] == expected_result
 
     def test_daemon_environment(self):
         """ Test daemon environment variables