Commit 60ac7526 authored by lavocat's avatar lavocat
Browse files

Correct bug level propagation

The argument for debug level is on string type. No need to convert it.
parent 5dabaa39
......@@ -1391,20 +1391,7 @@ class Erebor:
debug = ""
if len(self.debug_list) > 0 :
debug = "--debug="+(",".join(self.debug_list))
level = ""
if self.loglv == 50 :
level = "CRITICAL"
elif self.loglv == 40 :
level = "ERROR"
elif self.loglv == 30 :
level = "WARNING"
elif self.loglv == 20 :
level = "INFO"
elif self.loglv == 10 :
level = "DEBUG"
else :
level = "NOTSET"
debug += " --debug-level "+level
debug += " --debug-level "+self.loglv
if self.logf != "" :
debug += " --debug-file "+self.logf
# launch the children
......
......@@ -72,20 +72,7 @@ class Unix_socket(Thread):
debug = ""
if len(self.debug_list) > 0 :
debug = "--debug "+(",".join(self.debug_list))
level = ""
if self.loglv == logging.CRITICAL :
level = "CRITICAL"
elif self.loglv == logging.ERROR :
level = "ERROR"
elif self.loglv == logging.WARNING :
level = "WARNING"
elif self.loglv == logging.INFO :
level = "INFO"
elif self.loglv == logging.DEBUG :
level = "DEBUG"
else :
level = "NOTSET"
debug += " --debug-level "+level
debug += " --debug-level "+self.loglv
if self.logf != "" :
debug += " --debug-file "+self.logf
cmd ='0 exec [ python3 -c \"__requires__ = \'yggdrasil\';import sys;from pkg_resources import load_entry_point;sys.exit(load_entry_point(\'yggdrasil\', \'console_scripts\', \'taktuk-bridge\')());\" --socket '+self.control_adress+" "+debug+" ] "
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment