The default values written to the config were wrong and made the
controller crash on the next invocation.
Another problem was in lnst-slave. The slave script didn't load the
colour configuration from the conf file properly.
Both of them should be fixed now.
Signed-off-by: Radek Pazdera <rpazdera(a)redhat.com>
---
lnst-ctl | 2 +-
lnst-slave | 3 +++
lnst/Common/Colours.py | 7 +++++--
lnst/Common/Config.py | 18 +++++++++---------
4 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/lnst-ctl b/lnst-ctl
index 97039ed..7dcace6 100755
--- a/lnst-ctl
+++ b/lnst-ctl
@@ -135,7 +135,7 @@ def main():
elif opt in ("-m", "--no-colours"):
coloured_output = False
- load_presets_from_config()
+ load_presets_from_config(lnst_config)
date = datetime.datetime.now().strftime("%Y-%m-%d_%H:%M:%S")
log_ctl = LoggingCtl(debug,
diff --git a/lnst-slave b/lnst-slave
index 1e7dee8..ce6c390 100755
--- a/lnst-slave
+++ b/lnst-slave
@@ -18,6 +18,7 @@ import logging
from lnst.Common.Daemon import Daemon
from lnst.Common.Logs import LoggingCtl
from lnst.Common.Config import lnst_config
+from lnst.Common.Colours import load_presets_from_config
from lnst.Slave.NetTestSlave import NetTestSlave
def usage():
@@ -76,6 +77,8 @@ def main():
elif opt in ("-m", "--no-colours"):
coloured_output = False
+ load_presets_from_config(lnst_config)
+
log_ctl = LoggingCtl(debug,
log_dir=lnst_config.get_option('environment',
'log_dir'),
colours=coloured_output)
diff --git a/lnst/Common/Colours.py b/lnst/Common/Colours.py
index c88bf5d..1b72d58 100644
--- a/lnst/Common/Colours.py
+++ b/lnst/Common/Colours.py
@@ -14,7 +14,6 @@ import logging
import os
import re
from lnst.Common.Utils import bool_it
-from lnst.Common.Config import lnst_config
COLOURS = {
"black": 30,
@@ -166,7 +165,11 @@ def decorate_with_preset(string, preset):
def strip_colours(text):
return re.sub("\033\[[0-9]+(;[0-9]+){0,2}m", "", text)
-def load_presets_from_config():
+def get_preset_conf(preset_name):
+ preset = PRESETS[preset_name]
+ return map(lambda s: "default" if s == None else str(s), preset)
+
+def load_presets_from_config(lnst_config):
for preset_name in PRESETS:
preset = lnst_config.get_option("colours", preset_name)
if preset == None:
diff --git a/lnst/Common/Config.py b/lnst/Common/Config.py
index 2a74c25..67921d4 100644
--- a/lnst/Common/Config.py
+++ b/lnst/Common/Config.py
@@ -17,6 +17,7 @@ import re
from ConfigParser import ConfigParser
from lnst.Common.Utils import bool_it
from lnst.Common.NetUtils import verify_ip_address, verify_mac_address
+from lnst.Common.Colours import get_preset_conf
DefaultRPCPort = 9999
@@ -98,16 +99,15 @@ class Config():
def colours_scheme(self):
self.options['colours'] = dict()
- for preset in ["default", "faded", "alert",
"highlight",
- "pass", "fail", "error",
"info", "debug", "warning",
- "log_header"]:
- self.options['colours'][preset] = {\
- "value" : None, "additive" : False,
- "action" : self.optionColour, "name" : preset}
-
self.options['colours']["disable_colours"] = {\
- "value" : False, "additive" : False,
- "action" : self.optionBool, "name" :
"disable_colours"}
+ "value": False, "additive": False,
+ "action": self.optionBool, "name":
"disable_colours"}
+
+ for preset in ["faded", "alert", "highlight",
"pass", "fail", "error",
+ "info", "debug", "warning",
"log_header"]:
+ self.options['colours'][preset] = {\
+ "value": get_preset_conf(preset), "additive":
False,
+ "action": self.optionColour, "name": preset}
def get_config(self):
return self.options
--
1.8.3.1