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

Separate the event writing code from the debug variable check. 

git-svn-id: http://voip.null.ro/svn/yate@4575 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
paulc 2011-08-29 11:08:59 +00:00
parent 60237de62d
commit 37b76c0bb5
1 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
modules/rmanager.cpp
View File

@ -213,6 +213,7 @@ public:
void clearLine();
void writeStr(const char *str, int len = -1);
void writeDebug(const char *str, int level);
void writeEvent(const char *str, int level);
void writeStr(const Message &msg, bool received);
inline void writeStr(const String &s)
{ writeStr(s.safe(),s.length()); }
@ -1356,29 +1357,34 @@ 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)))
writeEvent(str,level);
}
// unconditionally write an event to the remote console
void Connection::writeEvent(const char *str, int level)
{
if (null(str))
return;
if ((m_debug && (m_threshold >= level)) || (m_output && (level < 0))) {
if (m_echoing && m_buffer)
clearLine();
const char* col = m_colorize ? debugColor(level) : 0;
if (col)
writeStr(col,::strlen(col));
int len = ::strlen(str);
for (; len > 0; len--) {
if ((unsigned char)str[len-1] >= ' ')
break;
}
writeStr(str,len);
writeStr("\r\n",2);
if (col)
col = debugColor(-2);
if (col)
writeStr(col,::strlen(col));
if (m_echoing && m_buffer)
writeStr(m_buffer);
if (m_echoing && m_buffer)
clearLine();
const char* col = m_colorize ? debugColor(level) : 0;
if (col)
writeStr(col,::strlen(col));
int len = ::strlen(str);
for (; len > 0; len--) {
if ((unsigned char)str[len-1] >= ' ')
break;
}
writeStr(str,len);
writeStr("\r\n",2);
if (col)
col = debugColor(-2);
if (col)
writeStr(col,::strlen(col));
if (m_echoing && m_buffer)
writeStr(m_buffer);
}
// write arbitrary string to the remote console