retronetworking
/
yate
12
0
Fork 2
Code Issues Pull Requests Projects Releases Wiki Activity

Allow rmanager output to be turned off even if debug is on but preserve ^O cycling logic. 

git-svn-id: http://voip.null.ro/svn/yate@6254 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
paulc 2017-08-11 15:37:12 +00:00
parent 12be659381
commit bbe04a7b60
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conf.d/rmanager.conf.sample
View File

@ -39,7 +39,7 @@
; output: bool: Enable output as soon as connecting
; This setting is ignored if an userpass is set
;output=no
;output=no (yes if local debug is enabled, see below)
; debug: bool: Enable local debug as soon as connecting
; This setting is ignored if any password is set

9
modules/rmanager.cpp
View File

@ -500,9 +500,9 @@ void Connection::run()
}
else {
m_auth = cfg().getValue("password") ? User : Admin;
m_output = cfg().getBoolValue("output",false);
if (Admin == m_auth)
m_debug = cfg().getBoolValue("debug",false);
m_output = cfg().getBoolValue("output",m_debug);
}
m_histLen = cfg().getIntValue("maxhistory",DEF_HISTORY);
if (m_histLen > MAX_HISTORY)
@ -798,13 +798,14 @@ bool Connection::processChar(unsigned char c)
errorBeep();
return false;
}
// cycle [no output] -> [output] -> [debug (only if admin)]
// cycle [no output] -> [output] -> [output+debug (only if admin)]
if (m_debug)
m_output = m_debug = false;
else if (m_output) {
m_output = false;
if ((m_debug = (m_auth >= Admin)))
Debugger::enableOutput(true);
else
m_output = false;
}
else
m_output = true;
@ -1848,7 +1849,7 @@ void Connection::writeStr(const Message &msg, bool received)
// write debugging messages to the remote console
void Connection::writeDebug(const char *str, int level)
{
if ((m_debug && (m_threshold >= level)) || (m_output && (level < 0)))
if ((level < 0) ? m_output : (m_debug && (m_threshold >= level)))
writeEvent(str,level);
}