afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

use default log level of 3 ("INFO" level) with EMANE if unspecified in core.conf

Browse source 
(Boeing r1883)
This commit is contained in:
ahrenholz 2014-09-23 21:37:18 +00:00
parent 4ee92d1711
commit f081985433
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
daemon/core/emane/emane.py
View file

@ -54,6 +54,7 @@ class Emane(ConfigurableManager):
EVENTCFGVAR = 'LIBEMANEEVENTSERVICECONFIG' EVENTCFGVAR = 'LIBEMANEEVENTSERVICECONFIG'
# possible self.version values # possible self.version values
(EMANEUNK, EMANE074, EMANE081, EMANE091, EMANE092) = (0, 7, 8, 91, 92) (EMANEUNK, EMANE074, EMANE081, EMANE091, EMANE092) = (0, 7, 8, 91, 92)
DEFAULT_LOG_LEVEL = 3
def __init__(self, session): def __init__(self, session):
ConfigurableManager.__init__(self, session) ConfigurableManager.__init__(self, session)
@ -716,7 +717,7 @@ class Emane(ConfigurableManager):
if self.verbose: if self.verbose:
self.info("Emane.startdaemons()") self.info("Emane.startdaemons()")
path = self.session.sessiondir path = self.session.sessiondir
loglevel = "2" loglevel = str(self.DEFAULT_LOG_LEVEL)
cfgloglevel = self.session.getcfgitemint("emane_log_level") cfgloglevel = self.session.getcfgitemint("emane_log_level")
realtime = self.session.getcfgitembool("emane_realtime", True) realtime = self.session.getcfgitembool("emane_realtime", True)
if cfgloglevel: if cfgloglevel:
@ -762,7 +763,7 @@ class Emane(ConfigurableManager):
''' '''
if self.verbose: if self.verbose:
self.info("Emane.startdaemons()") self.info("Emane.startdaemons()")
loglevel = "2" loglevel = str(self.DEFAULT_LOG_LEVEL)
cfgloglevel = self.session.getcfgitemint("emane_log_level") cfgloglevel = self.session.getcfgitemint("emane_log_level")
realtime = self.session.getcfgitembool("emane_realtime", True) realtime = self.session.getcfgitembool("emane_realtime", True)
if cfgloglevel: if cfgloglevel: