[checkmk-commits] Encapsulate Table::_logger.

Module: check_mk Branch: master Commit: c9023467be1b100567518a6960ddca45f0b47cfa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c9023467be1b10… Author: Sven Panne &lt;sp(a)mathias-kettner.de&gt; Date: Tue Mar 14 14:46:31 2017 +0100 Encapsulate Table::_logger. Change-Id: I2370ec1305f31cbb3c2ae0aeafad47cf6b5ec7cf --- livestatus/src/Query.cc | 2 +- livestatus/src/Table.cc | 12 +++++++----- livestatus/src/Table.h | 4 +++- livestatus/src/TableHosts.cc | 2 +- livestatus/src/TableStateHistory.cc | 2 +- 5 files changed, 13 insertions(+), 9 deletions(-) diff --git a/livestatus/src/Query.cc b/livestatus/src/Query.cc index ee8114f..f1e84c8 100644 --- a/livestatus/src/Query.cc +++ b/livestatus/src/Query.cc @@ -78,7 +78,7 @@ Query::Query(const list<string> &lines, Table *table, Encoding data_encoding, , _time_limit_timeout(0) , _current_line(0) , _timezone_offset(0) - , _logger(table->_logger) { + , _logger(table->logger()) { for (auto &line : lines) { vector<char> line_copy(line.begin(), line.end()); line_copy.push_back('\0'); diff --git a/livestatus/src/Table.cc b/livestatus/src/Table.cc index 439bcaa..d2da8d2 100644 --- a/livestatus/src/Table.cc +++ b/livestatus/src/Table.cc @@ -83,21 +83,21 @@ unique_ptr<Column> Table::dynamicColumn(const string &name, const string &rest) { auto it = _dynamic_columns.find(name); if (it == _dynamic_columns.end()) { - Warning(_logger) << "Unknown dynamic column '" << name << "'"; + Warning(logger()) << "Unknown dynamic column '" << name << "'"; return nullptr; } auto sep_pos = rest.find(':'); if (sep_pos == string::npos) { - Warning(_logger) << "Missing separator in dynamic column '" << name - << "'"; + Warning(logger()) << "Missing separator in dynamic column '" << name + << "'"; return nullptr; } string name2 = rest.substr(0, sep_pos); if (name2.empty()) { - Warning(_logger) << "Empty column name for dynamic column '" << name - << "'"; + Warning(logger()) << "Empty column name for dynamic column '" << name + << "'"; return nullptr; } @@ -109,3 +109,5 @@ bool Table::isAuthorized(contact * /*unused*/, void * /*unused*/) { } void *Table::findObject(const string & /*unused*/) { return nullptr; } + +Logger *Table::logger() const { return _logger; } diff --git a/livestatus/src/Table.h b/livestatus/src/Table.h index 9b8b19a..748de3a 100644 --- a/livestatus/src/Table.h +++ b/livestatus/src/Table.h @@ -92,9 +92,11 @@ public: virtual bool isAuthorized(contact *ctc, void *data); virtual void *findObject(const std::string &objectspec); - Logger *const _logger; + Logger *logger() const; private: + Logger *const _logger; + std::unique_ptr<Column> dynamicColumn(const std::string &name, const std::string &rest); diff --git a/livestatus/src/TableHosts.cc b/livestatus/src/TableHosts.cc index a1dedeb..657037a 100644 --- a/livestatus/src/TableHosts.cc +++ b/livestatus/src/TableHosts.cc @@ -634,7 +634,7 @@ void TableHosts::addColumns(Table *table, const string &prefix, table->addDynamicColumn(make_unique<DynamicLogwatchFileColumn>( prefix + "mk_logwatch_file", - "This contents of a logfile fetched via mk_logwatch", table->_logger, + "This contents of a logfile fetched via mk_logwatch", table->logger(), mc, indirect_offset, extra_offset, -1)); table->addColumn(make_unique<HostSpecialDoubleColumn>( diff --git a/livestatus/src/TableStateHistory.cc b/livestatus/src/TableStateHistory.cc index 5a18b22..f69f8e0 100644 --- a/livestatus/src/TableStateHistory.cc +++ b/livestatus/src/TableStateHistory.cc @@ -639,7 +639,7 @@ void TableStateHistory::answerQuery(Query *query) { if (tp_state == nullptr) { // This line is broken... - Warning(_logger) + Warning(logger()) << "Error: Invalid syntax of TIMEPERIOD TRANSITION: " << entry->_complete; free(buffer);