nils/ebusd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

daemon log option reworked (logarea -> logareas; loglevel -> log level).

Browse Source
This commit is contained in:
Roland Jax
2014-10-02 22:33:04 +02:00
parent c65e74947f
commit 0d02a4ba8e
3 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+2 -1
View File
@@ -1,11 +1,12 @@
ebusd - ChangeLog ebusd - ChangeLog
----------------- -----------------
2014-10-09 Roland Jax <roland.jax@liwest.at> 2014-10-02 Roland Jax <roland.jax@liwest.at>
* class Network splitted into classes Network and Connection. * class Network splitted into classes Network and Connection.
* class Message separated from class Baseloop. * class Message separated from class Baseloop.
* global Objects (network, commands, ebusloop, cycdata) relocated into * global Objects (network, commands, ebusloop, cycdata) relocated into
new global Object baseloop. new global Object baseloop.
* daemon log option reworked (logarea -> logareas; loglevel -> log level).
2014-06-26 Roland Jax <roland.jax@liwest.at> 2014-06-26 Roland Jax <roland.jax@liwest.at>
* ebusdump merged into ebusctl. * ebusdump merged into ebusctl.
src/baseloop.cpp
+16 -14
View File
@@ -290,30 +290,32 @@ std::string BaseLoop::decodeMessage(const std::string& data)
break; break;
} }
if (cmd[1] == "on") m_ebusloop->dump(true); if (strcasecmp(cmd[1].c_str(), "on") == 0) m_ebusloop->dump(true);
if (cmd[1] == "off") m_ebusloop->dump(false); if (strcasecmp(cmd[1].c_str(), "off") == 0) m_ebusloop->dump(false);
result << "done"; result << "done";
break; break;
case logarea: case log:
if (cmd.size() != 2) { if (cmd.size () != 3 ) {
result << "usage: 'logarea area,area,..' (area: bas|net|bus|cyc|all)"; result << "usage: 'log areas area,area,..' (areas: bas|net|bus|cyc|all)" << std::endl
<< " 'log level level' (level: error|event|trace|debug)";
break; break;
} }
L.getSink(0)->setAreas(calcArea(cmd[1])); // ToDo: check for possible areas
if (strcasecmp(cmd[1].c_str(), "areas") == 0) {
L.getSink(0)->setAreas(calcArea(cmd[2]));
result << "done"; result << "done";
break; break;
case loglevel:
if (cmd.size() != 2) {
result << "usage: 'loglevel level' (level: error|event|trace|debug)";
break;
} }
L.getSink(0)->setLevel(calcLevel(cmd[1])); if (strcasecmp(cmd[1].c_str(), "level") == 0) {
L.getSink(0)->setLevel(calcLevel(cmd[2]));
result << "done"; result << "done";
break; break;
}
break;
//~ case cfgreload: //~ case cfgreload:
@@ -357,8 +359,8 @@ std::string BaseLoop::decodeMessage(const std::string& data)
<< " cyc - fetch cycle data 'cyc class cmd (sub)'" << std::endl << " cyc - fetch cycle data 'cyc class cmd (sub)'" << std::endl
<< " hex - send given hex value 'hex type value' (value: ZZPBSBNNDx)" << std::endl << std::endl << " hex - send given hex value 'hex type value' (value: ZZPBSBNNDx)" << std::endl << std::endl
<< " dump - change dump state 'dump state' (state: on|off)" << std::endl << std::endl << " dump - change dump state 'dump state' (state: on|off)" << std::endl << std::endl
<< " logarea - change log area 'logarea area,area,..' (area: bas|net|bus|cyc|all)" << std::endl << " log areas - change log areas 'log areas area,area,..' (areas: bas|net|bus|cyc|all)" << std::endl
<< " loglevel - change log level 'loglevel level' (level: error|event|trace|debug)" << std::endl << std::endl << " log level - change log level 'log level level' (level: error|event|trace|debug)" << std::endl << std::endl
//~ << " cfgreload - reload ebus configuration" << std::endl << std::endl //~ << " cfgreload - reload ebus configuration" << std::endl << std::endl
<< " stop - stop daemon" << std::endl << " stop - stop daemon" << std::endl
<< " quit - close connection" << std::endl << std::endl << " quit - close connection" << std::endl << std::endl
src/baseloop.h
+2 -4
View File
@@ -53,8 +53,7 @@ private:
cyc, // fetch cycle data cyc, // fetch cycle data
hex, // send hex value hex, // send hex value
dump, // change dump state dump, // change dump state
logarea, // change log area log, // change loggins settings
loglevel, // change log level
//~ cfgreload, // reload ebus configuration //~ cfgreload, // reload ebus configuration
help, // print commands help, // print commands
notfound notfound
@@ -67,8 +66,7 @@ private:
if (strcasecmp(item.c_str(), "cyc") == 0) return cyc; if (strcasecmp(item.c_str(), "cyc") == 0) return cyc;
if (strcasecmp(item.c_str(), "hex") == 0) return hex; if (strcasecmp(item.c_str(), "hex") == 0) return hex;
if (strcasecmp(item.c_str(), "dump") == 0) return dump; if (strcasecmp(item.c_str(), "dump") == 0) return dump;
if (strcasecmp(item.c_str(), "logarea") == 0) return logarea; if (strcasecmp(item.c_str(), "log") == 0) return log;
if (strcasecmp(item.c_str(), "loglevel") == 0) return loglevel;
//~ if (strcasecmp(item.c_str(), "cfgreload") == 0) return cfgreload; //~ if (strcasecmp(item.c_str(), "cfgreload") == 0) return cfgreload;
if (strcasecmp(item.c_str(), "help") == 0) return help; if (strcasecmp(item.c_str(), "help") == 0) return help;