Skip to content

Commit

Permalink
Update module logger configuration and allow to set log level in the …
Browse files Browse the repository at this point in the history 
…configuration
  • Loading branch information
@mohierf
mohierf committed Dec 3, 2017
1 parent ec9776e commit 60b60f7
Show file tree
Hide file tree
Showing 3 changed files with 85 additions and 41 deletions.
3 changes: 3 additions & 0 deletions alignak_module_logs/etc/arbiter/modules/mod-logs.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ define module {
module_types logs
python_name alignak_module_logs

# Module log level (DEBUG, INFO, WARNING, ERROR)
#log_level INFO

# Alignak Backend endpoint URL
# ---
# alignak_backend http://127.0.0.1:5000
Expand Down
9 changes: 8 additions & 1 deletion alignak_module_logs/logs.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,12 @@

from alignak_backend_client.client import Backend, BackendException

logger = logging.getLogger('alignak.module')
logger = logging.getLogger(__name__) # pylint: disable=invalid-name
for handler in logger.parent.handlers:
if isinstance(handler, logging.StreamHandler):
logger.parent.removeHandler(handler)

# pylint: disable=invalid-name
properties = {
'daemons': ['broker'],
'type': 'logs',
Expand Down Expand Up @@ -76,8 +80,11 @@ def __init__(self, mod_conf):
"""
BaseModule.__init__(self, mod_conf)

# pylint: disable=global-statement
global logger
logger = logging.getLogger('alignak.module.%s' % self.alias)
# Do not change log level for this module ...
# logger.setLevel(getattr(mod_conf, 'log_level', logging.INFO))

logger.debug("inner properties: %s", self.__dict__)
logger.debug("received configuration: %s", mod_conf.__dict__)
Expand Down
114 changes: 74 additions & 40 deletions test/test_module.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,37 +109,48 @@ def test_module_manager(self):
# Loading module logs
print("Load and init")
self.show_logs()
i=0
self.assert_log_match(re.escape(
"Importing Python module 'alignak_module_logs' for logs..."
), 0)
), i)
i += 1
self.assert_log_match(re.escape(
"Module properties: {'daemons': ['broker'], 'phases': ['running'], "
"'type': 'logs', 'external': True}"
), 1)
), i)
i += 1
self.assert_log_match(re.escape(
"Imported 'alignak_module_logs' for logs"
), 2)
), i)
i += 1
self.assert_log_match(re.escape(
"Loaded Python module 'alignak_module_logs' (logs)"
), 3)
), i)
i += 1
self.assert_log_match(re.escape(
"Give an instance of alignak_module_logs for alias: logs"
), 4)
), i)
i += 1
self.assert_log_match(re.escape(
"logger default configuration:"
), 5)
), i)
i += 1
self.assert_log_match(re.escape(
" - rotating logs in /tmp/monitoring-logs.log"
), 6)
), i)
i += 1
self.assert_log_match(re.escape(
" - log level: 20"
), 7)
), i)
i += 1
self.assert_log_match(re.escape(
" - rotation every 1 midnight, keeping 365 files"
), 8)
), i)
i += 1
self.assert_log_match(re.escape(
"Alignak Backend is not configured. Some module features will not be available."
), 9)
), i)
i += 1

time.sleep(1)
# Reload the module
Expand All @@ -149,75 +160,98 @@ def test_module_manager(self):
#
# Loading module logs
self.show_logs()
i = 0
self.assert_log_match(re.escape(
"Importing Python module 'alignak_module_logs' for logs..."
), 0)
), i)
i += 1
self.assert_log_match(re.escape(
"Module properties: {'daemons': ['broker'], 'phases': ['running'], "
"'type': 'logs', 'external': True}"
), 1)
), i)
i += 1
self.assert_log_match(re.escape(
"Imported 'alignak_module_logs' for logs"
), 2)
), i)
i += 1
self.assert_log_match(re.escape(
"Loaded Python module 'alignak_module_logs' (logs)"
), 3)
), i)
i += 1
self.assert_log_match(re.escape(
"Give an instance of alignak_module_logs for alias: logs"
), 4)
), i)
i += 1
self.assert_log_match(re.escape(
"logger default configuration:"
), 5)
), i)
i += 1
self.assert_log_match(re.escape(
" - rotating logs in /tmp/monitoring-logs.log"
), 6)
), i)
i += 1
self.assert_log_match(re.escape(
" - log level: 20"
), 7)
), i)
i += 1
self.assert_log_match(re.escape(
" - rotation every 1 midnight, keeping 365 files"
), 8)
), i)
i += 1
self.assert_log_match(re.escape(
"Alignak Backend is not configured. Some module features will not be available."
), 9)
), i)
i += 1

self.assert_log_match(re.escape(
"Importing Python module 'alignak_module_logs' for logs..."
), 10)
), i)
i += 1
self.assert_log_match(re.escape(
"Module properties: {'daemons': ['broker'], 'phases': ['running'], "
"'type': 'logs', 'external': True}"
), 11)
), i)
i += 1
self.assert_log_match(re.escape(
"Imported 'alignak_module_logs' for logs"
), 12)
), i)
i += 1
self.assert_log_match(re.escape(
"Loaded Python module 'alignak_module_logs' (logs)"
), 13)
), i)
i += 1
self.assert_log_match(re.escape(
"Request external process to stop for logs"
), 14)
), i)
i += 1
self.assert_log_match(re.escape(
"External process stopped."
), 15)
), i)
i += 1
self.assert_log_match(re.escape(
"Give an instance of alignak_module_logs for alias: logs"
), 16)
), i)
i += 1
self.assert_log_match(re.escape(
"logger default configuration:"
), 17)
), i)
i += 1
self.assert_log_match(re.escape(
" - rotating logs in /tmp/monitoring-logs.log"
), 18)
), i)
i += 1
self.assert_log_match(re.escape(
" - log level: 20"
), 19)
), i)
i += 1
self.assert_log_match(re.escape(
" - rotation every 1 midnight, keeping 365 files"
), 20)
), i)
i += 1
self.assert_log_match(re.escape(
"Alignak Backend is not configured. Some module features will not be available."
), 21)
), i)
i += 1

my_module = self.modulemanager.instances[0]

Expand Down Expand Up @@ -329,11 +363,11 @@ def test_module_manager(self):

self.assert_log_match("Request external process to stop for logs", 9)
self.assert_log_match(re.escape("I'm stopping module 'logs' (pid="), 10)
self.assert_log_match(
re.escape("'logs' is still alive after normal kill, I help it to die"), 11
)
self.assert_log_match("Killing external module ", 12)
self.assert_log_match("External module killed", 13)
# self.assert_log_match(
# re.escape("'logs' is still alive after normal kill, I help it to die"), 11
# )
# self.assert_log_match("Killing external module ", 12)
# self.assert_log_match("External module killed", 13)
self.assert_log_match("External process stopped.", 14)

def test_module_start_default(self):
Expand Down Expand Up @@ -472,8 +506,7 @@ def test_module_start_parameters_2(self):
self.assert_log_match(
re.escape("Give an instance of alignak_module_logs for alias: logs"), 0)
self.assert_log_match(
re.escape("logger configuration defined in ./mod-logs-logger_syntax.json"), 1
)
re.escape("logger configuration defined in ./mod-logs-logger_syntax.json"), 1)
self.assert_log_match(
re.escape("Logger configuration file is not parsable correctly!"), 2)
self.assert_log_match(
Expand Down Expand Up @@ -738,7 +771,8 @@ def test_module_zzz_logger_json_configuration(self):
self.assert_log_match("logs is now started", 3)
self.assert_log_match("Give an instance of alignak_module_logs for alias: logs", 4)
self.assert_log_match("logger configuration defined in ./mod-logs-logger.json", 5)
self.assert_log_match("Alignak Backend is not configured. Some module features will not be available.", 6)
self.assert_log_match("Alignak Backend is not configured. "
"Some module features will not be available.", 6)
self.assert_log_match("Request external process to stop for logs", 7)
self.assert_log_match("I'm stopping module 'logs'", 8)
self.assert_log_match("External process stopped.", 9)
Expand Down

0 comments on commit 60b60f7

Please sign in to comment.