Eliminate human log format

bin/shinken-admin

@@ -310,9 +310,9 @@ class ShinkenAdmin(cmd.Cmd):
             return
 
         daemon = '*' if len(args) < 2 else args[0]
-        try:
-            loglevel = logger.get_level_id(args[-1])
-        except KeyError:
+        loglevel = shinken.log.getLevelName(args[-1])
+        if ' ' in loglevel:
+            # "Level xxx" returned, so this is none of the predefined levels
             print "Invalid '%s' log level. Must be one of DEBUG, INFO, WARNING, ERROR, CRITICAL" % args[-1]
             return
 

bin/shinken-packs

@@ -49,10 +49,10 @@ except ImportError:
     imp.load_module('shinken', *imp.find_module('shinken', [os.path.realpath("."), os.path.realpath(".."), os.path.join(os.path.abspath(os.path.dirname(sys.argv[0])), "..")]))
     from shinken.bin import VERSION
 
-from shinken.log import logger
+from shinken.log import logger, DEBUG
 from shinken.objects.config import Config
 
-logger.set_level(logger.DEBUG)
+logger.setLevel(DEBUG)
 
 
 class Dummy():

etc/nagios-windows.cfg

@@ -115,17 +115,6 @@ use_ssl=0
 #server_cert=etc/certs/server.pem
 #hard_ssl_name_check=0
 
-
-# If in the log you want to see
-# [Fri Apr 15 15:43:19 2011] instead of
-# [1302874960], put this value to 1
-# WARNING:
-#  But beware, it won't be parsable anymore by tools
-#  like Centreon or Thruk
-human_timestamp_log=0
-
-
-
 # The arbiter can have it's own local log
 local_log=c:\\shinken\\var\\arbiterd.log
 

etc/nagios.cfg

@@ -139,17 +139,6 @@ use_ssl=0
 #server_cert=etc/certs/server.pem
 #hard_ssl_name_check=0
 
-
-# If in the log you want to see
-# [Fri Apr 15 15:43:19 2011] instead of
-# [1302874960], put this value to 1
-# WARNING:
-#  But beware, it won't be parsable anymore by tools
-#  like Centreon or Thruk
-human_timestamp_log=0
-
-
-
 # The arbiter can have it's own local log
 local_log=arbiterd.log
 

for_fedora/etc/nagios.cfg

@@ -112,15 +112,6 @@ use_ssl=0
 #server_cert=etc/certs/server.pem
 hard_ssl_name_check=0
 
-
-# If in the log you want to see
-# [Fri Apr 15 15:43:19 2011] instead of
-# [1302874960], put this value to 1
-# WARNING:
-#  But beware, it won't be parsable anymore by tools
-#  like Centreon or Thruk
-human_timestamp_log=0
-
 # Set to 0 will enable the nagios behavior that will
 # launch event handlers even if the element is in downtime.
 no_event_handlers_during_downtimes=1

libexec/hostd/hostd_packs.py

@@ -20,10 +20,10 @@
 
 from shinken.objects.pack import Pack, Packs
 
-from shinken.log import logger
+from shinken.log import logger, DEBUG
 from shinken.objects.config import Config
 
-logger.set_level(10)
+logger.setLevel(DEBUG)
 
 
 class Dummy():

shinken/daemon.py

@@ -114,7 +114,7 @@ def have_conf(self):
         return self.app.cur_conf is not None
 
     def set_log_level(self, loglevel):
-        return logger.set_level(loglevel)
+        return logger.setLevel(loglevel)
 
 # If we are under android, we can't give parameters
 if is_android:
@@ -215,7 +215,6 @@ def do_stop(self):
             print('Stopping inter-process message (PYRO)')
         if self.pyro_daemon:
             pyro.shutdown(self.pyro_daemon)
-        logger.quit()
 
 
     def request_stop(self):
@@ -479,10 +478,10 @@ def do_daemon_init_and_start(self, use_pyro=True):
             self.setup_pyro_daemon()
 
         # Setting log level
-        logger.set_level(self.log_level)
+        logger.setLevel(self.log_level)
         # Force the debug level if the daemon is said to start with such level
         if self.debug:
-            logger.set_level('DEBUG')
+            logger.setLevel('DEBUG')
 
         # Then start to log all in the local file if asked so
         self.register_local_log()

shinken/daemons/arbiterdaemon.py

@@ -621,8 +621,6 @@ def run(self):
             if arb.is_me():
                 self.me = arb
 
-        if self.conf.human_timestamp_log:
-            logger.set_human_format()
         logger.info("Begin to dispatch configurations to satellites")
         self.dispatcher = Dispatcher(self.conf, self.me)
         self.dispatcher.check_alive()

shinken/daemons/hostddaemon.py

@@ -47,6 +47,7 @@
 import tempfile
 import shutil
 
+import shinken
 from shinken.objects.config import Config
 from shinken.objects.pack import Pack, Packs
 from shinken.external_command import ExternalCommandManager
@@ -366,7 +367,7 @@ def load_config_file(self):
         # Ok, here we must check if we go on or not.
         # TODO: check OK or not
         self.use_local_log = self.conf.use_local_log
-        self.log_level = logger.get_level_id(self.conf.log_level)
+        self.log_level = shinken.log.getLevelName(self.conf.log_level)
         self.local_log = self.conf.local_log
         self.pidfile = os.path.abspath(self.conf.lock_file)
         self.idontcareaboutsecurity = self.conf.idontcareaboutsecurity
@@ -573,10 +574,6 @@ def push_external_commands_to_schedulers(self):
 
     # Main function
     def run(self):
-        if self.conf.human_timestamp_log:
-            logger.set_human_format()
-
-        # Ok start to work :)
         self.check_photo_dir()
 
         self.request = request

shinken/daemons/schedulerdaemon.py

@@ -278,9 +278,6 @@ def setup_new_conf(self):
         self.satellites = satellites
         #self.pollers = self.app.pollers
 
-        if self.conf.human_timestamp_log:
-            logger.set_human_format()
-
         # Now We create our pollers
         for pol_id in satellites['pollers']:
             # Must look if we already have it

shinken/daemons/skonfdaemon.py

@@ -42,6 +42,7 @@
 import zipfile
 import shutil
 
+import shinken
 from shinken.objects.config import Config
 from shinken.external_command import ExternalCommandManager
 from shinken.dispatcher import Dispatcher
@@ -331,7 +332,7 @@ def load_config_file(self):
         self.community_uri = str(self.conf.community_uri)
         self.http_proxy = str(self.conf.http_proxy)
         self.use_local_log = self.conf.use_local_log
-        self.log_level = logger.get_level_id(self.conf.log_level)
+        self.log_level = shinken.log.getLevelName(self.conf.log_level)
         self.local_log = self.conf.local_log
         self.pidfile = os.path.abspath(self.conf.lock_file)
         self.idontcareaboutsecurity = self.conf.idontcareaboutsecurity
@@ -535,10 +536,6 @@ def push_external_commands_to_schedulers(self):
 
     # Main function
     def run(self):
-        if self.conf.human_timestamp_log:
-            logger.set_human_format()
-
-        # Ok start to work :)
         self.check_photo_dir()
 
         self.request = request

shinken/dispatcher.py

@@ -396,7 +396,9 @@ def dispatch(self):
                             logger.warning('[%s] configuration dispatching error for scheduler %s' % (r.get_name(), sched.get_name()))
                             continue
 
-                        logger.info('[%s] Dispatch OK of conf in scheduler %s' % (r.get_name(), sched.get_name()))
+                        # Log as `warning` since this is also used
+                        # when a spare gets the config.
+                        logger.warning('[%s] Dispatch OK of conf in scheduler %s' % (r.get_name(), sched.get_name()))
 
                         sched.conf = conf
                         sched.push_flavor = conf.push_flavor
@@ -512,7 +514,9 @@ def dispatch(self):
 
                                     if is_sent:
                                         satellite.active = True
-                                        logger.info('[%s] Dispatch OK of configuration %s to %s %s' % (r.get_name(), cfg_id, kind, satellite.get_name()))
+                                        # Log as `warning` since this is also used
+                                        # when a spare gets the config.
+                                        logger.warning('[%s] Dispatch OK of configuration %s to %s %s' % (r.get_name(), cfg_id, kind, satellite.get_name()))
                                         # We change the satellite configuration, update our data
                                         satellite.known_conf_managed_push(cfg_id, flavor)
 
@@ -546,6 +550,8 @@ def dispatch(self):
                         if is_sent:
                             rec.active = True
                             rec.need_conf = False
-                            logger.info('[%s] Dispatch OK of configuration to receiver %s' % (r.get_name(), rec.get_name()))
+                            # Log as `warning` since this is also used
+                            # when a spare gets the config.
+                            logger.warning('[%s] Dispatch OK of configuration to receiver %s' % (r.get_name(), rec.get_name()))
                         else:
                             logger.error('[%s] Dispatching failed for receiver %s' % (r.get_name(), rec.get_name()))

shinken/external_command.py

@@ -31,7 +31,7 @@
 from shinken.contactdowntime import ContactDowntime
 from shinken.comment import Comment
 from shinken.commandcall import CommandCall
-from shinken.log import logger, console_logger
+from shinken.log import logger, send_result
 from shinken.pollerlink import PollerLink
 
 MODATTR_NONE = 0
@@ -1286,8 +1286,9 @@ def PROCESS_FILE(self, file_name, delete):
     def PROCESS_HOST_CHECK_RESULT(self, host, status_code, plugin_output):
         #raise a PASSIVE check only if needed
         if self.conf.log_passive_checks:
-            console_logger.info('PASSIVE HOST CHECK: %s;%d;%s'
-                                % (host.get_name().decode('utf8', 'ignore'), status_code, plugin_output.decode('utf8', 'ignore')))
+            send_result('PASSIVE HOST CHECK: %s;%d;%s'
+                        % (host.get_name().decode('utf8', 'ignore'),
+                           status_code, plugin_output.decode('utf8', 'ignore')))
         now = time.time()
         cls = host.__class__
         # If globally disable OR locally, do not launch
@@ -1319,9 +1320,10 @@ def PROCESS_HOST_OUTPUT(self, host, plugin_output):
     def PROCESS_SERVICE_CHECK_RESULT(self, service, return_code, plugin_output):
         # raise a PASSIVE check only if needed
         if self.conf.log_passive_checks:
-            console_logger.info('PASSIVE SERVICE CHECK: %s;%s;%d;%s'
-                                % (service.host.get_name().decode('utf8', 'ignore'), service.get_name().decode('utf8', 'ignore'),
-                                   return_code, plugin_output.decode('utf8', 'ignore')))
+            send_result('PASSIVE SERVICE CHECK: %s;%s;%d;%s'
+                        % (service.host.get_name().decode('utf8', 'ignore'),
+                           service.get_name().decode('utf8', 'ignore'),
+                           return_code, plugin_output.decode('utf8', 'ignore')))
         now = time.time()
         cls = service.__class__
         # If globally disable OR locally, do not launch