diff options
author | Henning Baldersheim <balder@oath.com> | 2018-10-09 12:25:06 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@oath.com> | 2018-10-09 12:25:06 +0200 |
commit | db8f9e5c7cd447a34b8f415ea8ab287bd0a1f414 (patch) | |
tree | 31ffda159e643480bac76242a08a76ed0d8783e5 | |
parent | 5cac96aafb48eadc4ff3f1281fb1a562921d1b0b (diff) |
Parse logctlname correctly in non dotted case.
-rw-r--r-- | logd/src/logd/service.cpp | 2 | ||||
-rw-r--r-- | logd/src/logd/service.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/logd/src/logd/service.cpp b/logd/src/logd/service.cpp index 88d17a93b44..0227daeb803 100644 --- a/logd/src/logd/service.cpp +++ b/logd/src/logd/service.cpp @@ -15,7 +15,7 @@ unsigned long Component::defFwd = (unsigned long)-1; Component::Component(const std::string & servicename, const std::string & name) : _isforwarding(defFwd), _lastseen(0.0), _lastpid(0), _myservice(servicename), _myname(name), - _logctlname(name.substr(name.find('.'))) + _logctlname(name.substr(std::min(name.size(), name.find('.')))) { assert(ns_log::Logger::NUM_LOGLEVELS < 32); } diff --git a/logd/src/logd/service.h b/logd/src/logd/service.h index 65f580ee54e..6c43a395e67 100644 --- a/logd/src/logd/service.h +++ b/logd/src/logd/service.h @@ -36,6 +36,7 @@ public: void remember(double t, int p) { _lastseen = t; _lastpid = p; } double lastSeen() const { return _lastseen; } double lastPid() const { return _lastpid; } + const std::string getLogCtlName() const { return _logctlname; } }; class Service |