Remove more redundant wrappers from CompatUtility class

[icinga2] / lib / livestatus / logtable.cpp

diff --git a/lib/livestatus/logtable.cpp b/lib/livestatus/logtable.cpp
index b378049a313c7387738546a1f6076fe08a040c32..df8ba859a721205e162fbf4ac8e616c1c2171ecc 100644 (file)
--- a/lib/livestatus/logtable.cpp
+++ b/lib/livestatus/logtable.cpp
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Icinga 2                                                                   *
- * Copyright (C) 2012-2014 Icinga Development Team (http://www.icinga.org)    *
+ * Copyright (C) 2012-2018 Icinga Development Team (https://www.icinga.com/)  *
  *                                                                            *
  * This program is free software; you can redistribute it and/or              *
  * modify it under the terms of the GNU General Public License                *
@@ -33,10 +33,9 @@
 #include "icinga/notificationcommand.hpp"
 #include "base/convert.hpp"
 #include "base/utility.hpp"
-#include "base/logger_fwd.hpp"
+#include "base/logger.hpp"
 #include "base/application.hpp"
 #include "base/objectlock.hpp"
-#include <boost/foreach.hpp>
 #include <boost/tuple/tuple.hpp>
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/split.hpp>
@@ -57,10 +56,8 @@ LogTable::LogTable(const String& compat_log_path, time_t from, time_t until)
        AddColumns(this);
 }
 
-
-
 void LogTable::AddColumns(Table *table, const String& prefix,
-    const Column::ObjectAccessor& objectAccessor)
+       const Column::ObjectAccessor& objectAccessor)
 {
        table->AddColumn(prefix + "time", Column(&LogTable::TimeAccessor, objectAccessor));
        table->AddColumn(prefix + "lineno", Column(&LogTable::LinenoAccessor, objectAccessor));
@@ -78,25 +75,26 @@ void LogTable::AddColumns(Table *table, const String& prefix,
        table->AddColumn(prefix + "contact_name", Column(&LogTable::ContactNameAccessor, objectAccessor));
        table->AddColumn(prefix + "command_name", Column(&LogTable::CommandNameAccessor, objectAccessor));
 
-       HostsTable::AddColumns(table, "current_host_", boost::bind(&LogTable::HostAccessor, _1, objectAccessor));
-       ServicesTable::AddColumns(table, "current_service_", boost::bind(&LogTable::ServiceAccessor, _1, objectAccessor));
-       ContactsTable::AddColumns(table, "current_contact_", boost::bind(&LogTable::ContactAccessor, _1, objectAccessor));
-       CommandsTable::AddColumns(table, "current_command_", boost::bind(&LogTable::CommandAccessor, _1, objectAccessor));
+       HostsTable::AddColumns(table, "current_host_", std::bind(&LogTable::HostAccessor, _1, objectAccessor));
+       ServicesTable::AddColumns(table, "current_service_", std::bind(&LogTable::ServiceAccessor, _1, objectAccessor));
+       ContactsTable::AddColumns(table, "current_contact_", std::bind(&LogTable::ContactAccessor, _1, objectAccessor));
+       CommandsTable::AddColumns(table, "current_command_", std::bind(&LogTable::CommandAccessor, _1, objectAccessor));
 }
 
-String LogTable::GetName(void) const
+String LogTable::GetName() const
 {
        return "log";
 }
 
-String LogTable::GetPrefix(void) const
+String LogTable::GetPrefix() const
 {
        return "log";
 }
 
 void LogTable::FetchRows(const AddRowFunction& addRowFn)
 {
-       Log(LogDebug, "LogTable", "Pre-selecting log file from " + Convert::ToString(m_TimeFrom) + " until " + Convert::ToString(m_TimeUntil));
+       Log(LogDebug, "LogTable")
+               << "Pre-selecting log file from " << m_TimeFrom << " until " << m_TimeUntil;
 
        /* create log file index */
        LivestatusLogUtility::CreateLogIndex(m_CompatLogPath, m_LogFileIndex);
@@ -111,7 +109,7 @@ void LogTable::UpdateLogEntries(const Dictionary::Ptr& log_entry_attrs, int line
        /* additional attributes only for log table */
        log_entry_attrs->Set("lineno", lineno);
 
-       addRowFn(log_entry_attrs);
+       addRowFn(log_entry_attrs, LivestatusGroupByNone, Empty);
 }
 
 Object::Ptr LogTable::HostAccessor(const Value& row, const Column::ObjectAccessor&)
@@ -119,7 +117,7 @@ Object::Ptr LogTable::HostAccessor(const Value& row, const Column::ObjectAccesso
        String host_name = static_cast<Dictionary::Ptr>(row)->Get("host_name");
 
        if (host_name.IsEmpty())
-               return Object::Ptr();
+               return nullptr;
 
        return Host::GetByName(host_name);
 }
@@ -130,7 +128,7 @@ Object::Ptr LogTable::ServiceAccessor(const Value& row, const Column::ObjectAcce
        String service_description = static_cast<Dictionary::Ptr>(row)->Get("service_description");
 
        if (service_description.IsEmpty() || host_name.IsEmpty())
-               return Object::Ptr();
+               return nullptr;
 
        return Service::GetByNamePair(host_name, service_description);
 }
@@ -140,7 +138,7 @@ Object::Ptr LogTable::ContactAccessor(const Value& row, const Column::ObjectAcce
        String contact_name = static_cast<Dictionary::Ptr>(row)->Get("contact_name");
 
        if (contact_name.IsEmpty())
-               return Object::Ptr();
+               return nullptr;
 
        return User::GetByName(contact_name);
 }
@@ -150,7 +148,7 @@ Object::Ptr LogTable::CommandAccessor(const Value& row, const Column::ObjectAcce
        String command_name = static_cast<Dictionary::Ptr>(row)->Get("command_name");
 
        if (command_name.IsEmpty())
-               return Object::Ptr();
+               return nullptr;
 
        CheckCommand::Ptr check_command = CheckCommand::GetByName(command_name);
        if (!check_command) {
@@ -158,15 +156,13 @@ Object::Ptr LogTable::CommandAccessor(const Value& row, const Column::ObjectAcce
                if (!event_command) {
                        NotificationCommand::Ptr notification_command = NotificationCommand::GetByName(command_name);
                        if (!notification_command)
-                               return Object::Ptr();
+                               return nullptr;
                        else
                                return notification_command;
                } else
                        return event_command;
        } else
                return check_command;
-
-       return Object::Ptr();
 }
 
 Value LogTable::TimeAccessor(const Value& row)
@@ -243,6 +239,3 @@ Value LogTable::CommandNameAccessor(const Value& row)
 {
        return static_cast<Dictionary::Ptr>(row)->Get("command_name");
 }
-
-
-