From 0d02a4ba8e38087d98d41123068e2580507259cb Mon Sep 17 00:00:00 2001 From: Roland Jax Date: Thu, 2 Oct 2014 22:33:04 +0200 Subject: [PATCH] daemon log option reworked (logarea -> logareas; loglevel -> log level). --- ChangeLog | 3 ++- src/baseloop.cpp | 32 +++++++++++++++++--------------- src/baseloop.h | 6 ++---- 3 files changed, 21 insertions(+), 20 deletions(-) diff --git a/ChangeLog b/ChangeLog index e20b9b68..9ea24953 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,11 +1,12 @@ ebusd - ChangeLog ----------------- -2014-10-09 Roland Jax +2014-10-02 Roland Jax * class Network splitted into classes Network and Connection. * class Message separated from class Baseloop. * global Objects (network, commands, ebusloop, cycdata) relocated into new global Object baseloop. +* daemon log option reworked (logarea -> logareas; loglevel -> log level). 2014-06-26 Roland Jax * ebusdump merged into ebusctl. diff --git a/src/baseloop.cpp b/src/baseloop.cpp index 585954c0..2fa032f1 100644 --- a/src/baseloop.cpp +++ b/src/baseloop.cpp @@ -290,29 +290,31 @@ std::string BaseLoop::decodeMessage(const std::string& data) break; } - if (cmd[1] == "on") m_ebusloop->dump(true); - if (cmd[1] == "off") m_ebusloop->dump(false); + if (strcasecmp(cmd[1].c_str(), "on") == 0) m_ebusloop->dump(true); + if (strcasecmp(cmd[1].c_str(), "off") == 0) m_ebusloop->dump(false); result << "done"; break; - case logarea: - if (cmd.size() != 2) { - result << "usage: 'logarea area,area,..' (area: bas|net|bus|cyc|all)"; + case log: + if (cmd.size () != 3 ) { + result << "usage: 'log areas area,area,..' (areas: bas|net|bus|cyc|all)" << std::endl + << " 'log level level' (level: error|event|trace|debug)"; break; } - L.getSink(0)->setAreas(calcArea(cmd[1])); - result << "done"; - break; + // ToDo: check for possible areas + if (strcasecmp(cmd[1].c_str(), "areas") == 0) { + L.getSink(0)->setAreas(calcArea(cmd[2])); + result << "done"; + break; + } - case loglevel: - if (cmd.size() != 2) { - result << "usage: 'loglevel level' (level: error|event|trace|debug)"; + if (strcasecmp(cmd[1].c_str(), "level") == 0) { + L.getSink(0)->setLevel(calcLevel(cmd[2])); + result << "done"; break; } - L.getSink(0)->setLevel(calcLevel(cmd[1])); - result << "done"; break; //~ case cfgreload: @@ -357,8 +359,8 @@ std::string BaseLoop::decodeMessage(const std::string& data) << " cyc - fetch cycle data 'cyc class cmd (sub)'" << 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 - << " logarea - change log area 'logarea area,area,..' (area: bas|net|bus|cyc|all)" << std::endl - << " loglevel - change log level 'loglevel level' (level: error|event|trace|debug)" << std::endl << std::endl + << " log areas - change log areas 'log areas area,area,..' (areas: bas|net|bus|cyc|all)" << 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 << " stop - stop daemon" << std::endl << " quit - close connection" << std::endl << std::endl diff --git a/src/baseloop.h b/src/baseloop.h index bce4c4bc..8d66741e 100644 --- a/src/baseloop.h +++ b/src/baseloop.h @@ -53,8 +53,7 @@ private: cyc, // fetch cycle data hex, // send hex value dump, // change dump state - logarea, // change log area - loglevel, // change log level + log, // change loggins settings //~ cfgreload, // reload ebus configuration help, // print commands notfound @@ -67,8 +66,7 @@ private: if (strcasecmp(item.c_str(), "cyc") == 0) return cyc; if (strcasecmp(item.c_str(), "hex") == 0) return hex; if (strcasecmp(item.c_str(), "dump") == 0) return dump; - if (strcasecmp(item.c_str(), "logarea") == 0) return logarea; - if (strcasecmp(item.c_str(), "loglevel") == 0) return loglevel; + if (strcasecmp(item.c_str(), "log") == 0) return log; //~ if (strcasecmp(item.c_str(), "cfgreload") == 0) return cfgreload; if (strcasecmp(item.c_str(), "help") == 0) return help;