Module: check_mk
Branch: master
Commit: 61116b3787161a625daf3d1b5bf18a9b669ff12a
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=61116b3787161a…
Author: Sven Panne <sp(a)mathias-kettner.de>
Date: Tue Feb 26 15:32:42 2019 +0100
Made naming more consistent.
Change-Id: I5a6aad00bca45d6a32e7ab75293f948c3d22e49c
---
livestatus/src/Logfile.cc | 6 +++---
livestatus/src/Logfile.h | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/livestatus/src/Logfile.cc b/livestatus/src/Logfile.cc
index 2a7df57..7d02c6d 100644
--- a/livestatus/src/Logfile.cc
+++ b/livestatus/src/Logfile.cc
@@ -65,10 +65,10 @@ time_t firstTimestampOf(const fs::path &path, Logger *logger) {
}
} // namespace
-Logfile::Logfile(MonitoringCore *mc, LogCache *logcache, fs::path path,
+Logfile::Logfile(MonitoringCore *mc, LogCache *log_cache, fs::path path,
bool watch)
: _mc(mc)
- , _logcache(logcache)
+ , _log_cache(log_cache)
, _path(std::move(path))
, _since(firstTimestampOf(_path, logger()))
, _watch(watch)
@@ -158,7 +158,7 @@ void Logfile::loadRange(FILE *file, unsigned missing_types,
}
}
if (processLogLine(_lineno, &linebuffer[0], missing_types)) {
- _logcache->logLineHasBeenAdded(this, logclasses);
+ _log_cache->logLineHasBeenAdded(this, logclasses);
}
}
}
diff --git a/livestatus/src/Logfile.h b/livestatus/src/Logfile.h
index 17e6662..f980344 100644
--- a/livestatus/src/Logfile.h
+++ b/livestatus/src/Logfile.h
@@ -47,7 +47,7 @@ using logfile_entries_t = std::map<uint64_t,
std::unique_ptr<LogEntry>>;
class Logfile {
public:
- Logfile(MonitoringCore *mc, LogCache *logcache, fs::path path, bool watch);
+ Logfile(MonitoringCore *mc, LogCache *log_cache, fs::path path, bool watch);
fs::path path() const { return _path; }
// for tricky protocol between LogCache::logLineHasBeenAdded and this class
@@ -65,7 +65,7 @@ public:
private:
MonitoringCore *const _mc;
- LogCache *const _logcache;
+ LogCache *const _log_cache;
const fs::path _path;
const time_t _since; // time of first entry
const bool _watch; // true only for current logfile