From d949fa39a113754c0d82978790c3f2ebf63d1dc9 Mon Sep 17 00:00:00 2001 From: Jan Vcelak Date: Fri, 8 Jan 2010 14:04:13 +0100 Subject: [PATCH] plugins: fixed logging level setting for plugins --- monitorplugins/cpu.py | 8 ++++++-- monitorplugins/disk.py | 7 +++++-- monitorplugins/net.py | 7 +++++-- tuned_logging.py | 14 ++++++-------- tuningplugins/cpu.py | 7 +++++-- tuningplugins/disk.py | 8 ++++++-- tuningplugins/net.py | 7 +++++-- 7 files changed, 38 insertions(+), 20 deletions(-) diff --git a/monitorplugins/cpu.py b/monitorplugins/cpu.py index 1780295..481c88d 100644 --- a/monitorplugins/cpu.py +++ b/monitorplugins/cpu.py @@ -22,6 +22,9 @@ import logging, tuned_logging log = logging.getLogger("tuned.cpumonitor") class CPUMonitor: + + config_section = "CPUMonitor" + def __init__(self): self.__update__() self.enabled = True @@ -33,9 +36,10 @@ class CPUMonitor: def init(self, config): log.debug("Init") self.config = config + if self.config.has_option(self.config_section, "enabled"): + self.enabled = (self.config.get(self.config_section, "enabled") == "True") + log.info("Module is %s" % ("enabled" if self.enabled else "disabled")) - if self.config.has_option("CPUMonitor", "enabled"): - self.enabled = (self.config.get("CPUMonitor", "enabled") == "True") def cleanup(self): log.debug("Cleanup") diff --git a/monitorplugins/disk.py b/monitorplugins/disk.py index 5e9495c..6c6045f 100644 --- a/monitorplugins/disk.py +++ b/monitorplugins/disk.py @@ -22,6 +22,9 @@ import logging, tuned_logging log = logging.getLogger("tuned.diskmonitor") class DiskMonitor: + + config_section = "DiskMonitor" + def __init__(self): self.devices = {} self.enabled = True @@ -52,8 +55,8 @@ class DiskMonitor: log.debug("Init") self.config = config - if self.config.has_option("DiskMonitor", "enabled"): - self.enabled = (self.config.get("DiskMonitor", "enabled") == "True") + if self.config.has_option(self.config_section, "enabled"): + self.enabled = (self.config.get(self.config_section, "enabled") == "True") log.info("Module is %s" % ("enabled" if self.enabled else "disabled")) diff --git a/monitorplugins/net.py b/monitorplugins/net.py index 8d62043..c73e854 100644 --- a/monitorplugins/net.py +++ b/monitorplugins/net.py @@ -23,6 +23,9 @@ from tuned_nettool import ethcard log = logging.getLogger("tuned.netmonitor") class NetMonitor: + + config_section = "NetMonitor" + def __init__(self): self.devices = {} self.enabled = True @@ -79,8 +82,8 @@ class NetMonitor: log.debug("Init") self.config = config - if self.config.has_option("NetMonitor", "enabled"): - self.enabled = (self.config.get("NetMonitor", "enabled") == "True") + if self.config.has_option(self.config_section, "enabled"): + self.enabled = (self.config.get(self.config_section, "enabled") == "True") interval = self.config.getint("main", "interval") log.info("Module is %s" % ("enabled" if self.enabled else "disabled")) diff --git a/tuned_logging.py b/tuned_logging.py index a4fbdd0..36f2d92 100644 --- a/tuned_logging.py +++ b/tuned_logging.py @@ -22,13 +22,7 @@ import logging.handlers class TunedLogger (logging.getLoggerClass()): def setLevelString(self, name): - name = str(name) - if name.isdigit(): - level = int(name) - else: - level = logging._levelNames.get(name.upper(), logging.NOTSET) - - self.level = level + self.level = logging._levelNames.get(str(name).upper(), logging.NOTSET) def switchToConsole(self): self.addHandler(console_handler) @@ -38,10 +32,14 @@ class TunedLogger (logging.getLoggerClass()): self.addHandler(file_handler) self.removeHandler(console_handler) -logging.setLoggerClass(TunedLogger) +def disableString(name): + level = logging._levelNames.get(str(name).upper(), logging.CRITICAL) + logging.disable(level) ###### +logging.setLoggerClass(TunedLogger) + console_handler = logging.StreamHandler() file_handler = logging.handlers.RotatingFileHandler("/tmp/tuned.log", maxBytes=200*1000, backupCount=2) diff --git a/tuningplugins/cpu.py b/tuningplugins/cpu.py index 10392cd..02ffb2b 100644 --- a/tuningplugins/cpu.py +++ b/tuningplugins/cpu.py @@ -22,6 +22,9 @@ import logging, tuned_logging log = logging.getLogger("tuned.cputuning") class CPUTuning: + + config_section = "CPUTuning" + def __init__(self): self.latency = 100 self.enabled = True @@ -30,8 +33,8 @@ class CPUTuning: log.debug("Init") self.config = config - if self.config.has_option("CPUTuning", "enabled"): - self.enabled = (self.config.get("CPUTuning", "enabled") == "True") + if self.config.has_option(self.config_section, "enabled"): + self.enabled = (self.config.get(self.config_section, "enabled") == "True") try: open("/dev/cpu_dma_latency", "w") except: diff --git a/tuningplugins/disk.py b/tuningplugins/disk.py index dbcdf12..0d65d17 100644 --- a/tuningplugins/disk.py +++ b/tuningplugins/disk.py @@ -22,6 +22,9 @@ import logging, tuned_logging log = logging.getLogger("tuned.disktuning") class DiskTuning: + + config_section = "DiskTuning" + def __init__(self): self.devidle = {} self.enabled = True @@ -44,9 +47,10 @@ class DiskTuning: log.debug("Init") self.config = config + if self.config.has_option(self.config_section, "enabled"): + self.enabled = (self.config.get(self.config_section, "enabled") == "True") + log.info("Module is %s" % ("enabled" if self.enabled else "disabled")) - if self.config.has_option("DiskTuning", "enabled"): - self.enabled = (self.config.get("DiskTuning", "enabled") == "True") def cleanup(self): log.debug("Cleanup") diff --git a/tuningplugins/net.py b/tuningplugins/net.py index b72d4ae..214e500 100644 --- a/tuningplugins/net.py +++ b/tuningplugins/net.py @@ -23,6 +23,9 @@ from tuned_nettool import ethcard log = logging.getLogger("tuned.nettuning") class NetTuning: + + config_section = "NetTuning" + def __init__(self): self.devidle = {} self.enabled = True @@ -42,8 +45,8 @@ class NetTuning: log.debug("Init") self.config = config - if self.config.has_option("NetTuning", "enabled"): - self.enabled = (self.config.get("NetTuning", "enabled") == "True") + if self.config.has_option(self.config_section, "enabled"): + self.enabled = (self.config.get(self.config_section, "enabled") == "True") log.info("Module is %s" % ("enabled" if self.enabled else "disabled"))