From 83021f8231dc8703f71c6f11ad6dd4376880d303 Mon Sep 17 00:00:00 2001 From: "Alexander A. Klimov" Date: Thu, 24 Nov 2022 12:40:36 +0100 Subject: [PATCH] CONTEXT: use << everywhere to unify usages --- lib/base/configobject.cpp | 6 +++--- lib/compat/checkresultreader.cpp | 4 ++-- lib/config/configcompiler.cpp | 4 ++-- lib/db_ido_mysql/idomysqlconnection.cpp | 2 +- lib/db_ido_pgsql/idopgsqlconnection.cpp | 2 +- lib/icinga/checkable-check.cpp | 4 ++-- lib/icinga/checkable-event.cpp | 2 +- lib/icinga/checkable-notification.cpp | 2 +- lib/icinga/dependency-apply.cpp | 4 ++-- lib/icinga/hostgroup.cpp | 4 ++-- lib/icinga/macroprocessor.cpp | 4 ++-- lib/icinga/notification-apply.cpp | 4 ++-- lib/icinga/scheduleddowntime-apply.cpp | 4 ++-- lib/icinga/service-apply.cpp | 2 +- lib/icinga/servicegroup.cpp | 4 ++-- lib/icinga/usergroup.cpp | 4 ++-- lib/perfdata/elasticsearchwriter.cpp | 6 +++--- lib/perfdata/gelfwriter.cpp | 8 ++++---- lib/perfdata/graphitewriter.cpp | 4 ++-- lib/perfdata/influxdbcommonwriter.cpp | 2 +- lib/perfdata/opentsdbwriter.cpp | 2 +- lib/perfdata/perfdatawriter.cpp | 2 +- lib/remote/apilistener-filesync.cpp | 2 +- lib/remote/apilistener.cpp | 2 +- 24 files changed, 42 insertions(+), 42 deletions(-) diff --git a/lib/base/configobject.cpp b/lib/base/configobject.cpp index 144afa4a9..4317771d1 100644 --- a/lib/base/configobject.cpp +++ b/lib/base/configobject.cpp @@ -352,7 +352,7 @@ void ConfigObject::Start(bool runtimeCreated) void ConfigObject::PreActivate() { - CONTEXT("Setting 'active' to true for object '" + GetName() + "' of type '" + GetReflectionType()->GetName() + "'"); + CONTEXT("Setting 'active' to true for object '" << GetName() << "' of type '" << GetReflectionType()->GetName() << "'"); ASSERT(!IsActive()); SetActive(true, true); @@ -360,7 +360,7 @@ void ConfigObject::PreActivate() void ConfigObject::Activate(bool runtimeCreated, const Value& cookie) { - CONTEXT("Activating object '" + GetName() + "' of type '" + GetReflectionType()->GetName() + "'"); + CONTEXT("Activating object '" << GetName() << "' of type '" << GetReflectionType()->GetName() << "'"); { ObjectLock olock(this); @@ -387,7 +387,7 @@ void ConfigObject::Stop(bool runtimeRemoved) void ConfigObject::Deactivate(bool runtimeRemoved, const Value& cookie) { - CONTEXT("Deactivating object '" + GetName() + "' of type '" + GetReflectionType()->GetName() + "'"); + CONTEXT("Deactivating object '" << GetName() << "' of type '" << GetReflectionType()->GetName() << "'"); { ObjectLock olock(this); diff --git a/lib/compat/checkresultreader.cpp b/lib/compat/checkresultreader.cpp index e4516a3c9..1757333aa 100644 --- a/lib/compat/checkresultreader.cpp +++ b/lib/compat/checkresultreader.cpp @@ -71,14 +71,14 @@ void CheckResultReader::Stop(bool runtimeRemoved) */ void CheckResultReader::ReadTimerHandler() const { - CONTEXT("Processing check result files in '" + GetSpoolDir() + "'"); + CONTEXT("Processing check result files in '" << GetSpoolDir() << "'"); Utility::Glob(GetSpoolDir() + "/c??????.ok", [this](const String& path) { ProcessCheckResultFile(path); }, GlobFile); } void CheckResultReader::ProcessCheckResultFile(const String& path) const { - CONTEXT("Processing check result file '" + path + "'"); + CONTEXT("Processing check result file '" << path << "'"); String crfile = String(path.Begin(), path.End() - 3); /* Remove the ".ok" extension. */ diff --git a/lib/config/configcompiler.cpp b/lib/config/configcompiler.cpp index 2c8fa5cc7..62f02ba19 100644 --- a/lib/config/configcompiler.cpp +++ b/lib/config/configcompiler.cpp @@ -235,7 +235,7 @@ std::unique_ptr ConfigCompiler::HandleIncludeZones(const String& rel std::unique_ptr ConfigCompiler::CompileStream(const String& path, std::istream *stream, const String& zone, const String& package) { - CONTEXT("Compiling configuration stream with name '" + path + "'"); + CONTEXT("Compiling configuration stream with name '" << path << "'"); stream->exceptions(std::istream::badbit); @@ -259,7 +259,7 @@ std::unique_ptr ConfigCompiler::CompileStream(const String& path, std::unique_ptr ConfigCompiler::CompileFile(const String& path, const String& zone, const String& package) { - CONTEXT("Compiling configuration file '" + path + "'"); + CONTEXT("Compiling configuration file '" << path << "'"); std::ifstream stream(path.CStr(), std::ifstream::in); diff --git a/lib/db_ido_mysql/idomysqlconnection.cpp b/lib/db_ido_mysql/idomysqlconnection.cpp index 42c8332c9..27815218e 100644 --- a/lib/db_ido_mysql/idomysqlconnection.cpp +++ b/lib/db_ido_mysql/idomysqlconnection.cpp @@ -201,7 +201,7 @@ void IdoMysqlConnection::Reconnect() if (!IsActive()) return; - CONTEXT("Reconnecting to MySQL IDO database '" + GetName() + "'"); + CONTEXT("Reconnecting to MySQL IDO database '" << GetName() << "'"); double startTime = Utility::GetTime(); diff --git a/lib/db_ido_pgsql/idopgsqlconnection.cpp b/lib/db_ido_pgsql/idopgsqlconnection.cpp index 9a20b95ab..843f8ef97 100644 --- a/lib/db_ido_pgsql/idopgsqlconnection.cpp +++ b/lib/db_ido_pgsql/idopgsqlconnection.cpp @@ -183,7 +183,7 @@ void IdoPgsqlConnection::Reconnect() { AssertOnWorkQueue(); - CONTEXT("Reconnecting to PostgreSQL IDO database '" + GetName() + "'"); + CONTEXT("Reconnecting to PostgreSQL IDO database '" << GetName() << "'"); double startTime = Utility::GetTime(); diff --git a/lib/icinga/checkable-check.cpp b/lib/icinga/checkable-check.cpp index 921231a9e..83c39e923 100644 --- a/lib/icinga/checkable-check.cpp +++ b/lib/icinga/checkable-check.cpp @@ -534,7 +534,7 @@ Checkable::ProcessingResult Checkable::ProcessCheckResult(const CheckResult::Ptr void Checkable::ExecuteRemoteCheck(const Dictionary::Ptr& resolvedMacros) { - CONTEXT("Executing remote check for object '" + GetName() + "'"); + CONTEXT("Executing remote check for object '" << GetName() << "'"); double scheduled_start = GetNextCheck(); double before_check = Utility::GetTime(); @@ -548,7 +548,7 @@ void Checkable::ExecuteRemoteCheck(const Dictionary::Ptr& resolvedMacros) void Checkable::ExecuteCheck() { - CONTEXT("Executing check for object '" + GetName() + "'"); + CONTEXT("Executing check for object '" << GetName() << "'"); /* keep track of scheduling info in case the check type doesn't provide its own information */ double scheduled_start = GetNextCheck(); diff --git a/lib/icinga/checkable-event.cpp b/lib/icinga/checkable-event.cpp index 2983be846..fb315d9f2 100644 --- a/lib/icinga/checkable-event.cpp +++ b/lib/icinga/checkable-event.cpp @@ -19,7 +19,7 @@ EventCommand::Ptr Checkable::GetEventCommand() const void Checkable::ExecuteEventHandler(const Dictionary::Ptr& resolvedMacros, bool useResolvedMacros) { - CONTEXT("Executing event handler for object '" + GetName() + "'"); + CONTEXT("Executing event handler for object '" << GetName() << "'"); if (!IcingaApplication::GetInstance()->GetEnableEventHandlers() || !GetEnableEventHandler()) return; diff --git a/lib/icinga/checkable-notification.cpp b/lib/icinga/checkable-notification.cpp index 779ed4b7b..79b598612 100644 --- a/lib/icinga/checkable-notification.cpp +++ b/lib/icinga/checkable-notification.cpp @@ -34,7 +34,7 @@ void Checkable::SendNotifications(NotificationType type, const CheckResult::Ptr& { String checkableName = GetName(); - CONTEXT("Sending notifications for object '" + checkableName + "'"); + CONTEXT("Sending notifications for object '" << checkableName << "'"); bool force = GetForceNextNotification(); diff --git a/lib/icinga/dependency-apply.cpp b/lib/icinga/dependency-apply.cpp index 134395c11..8681c4332 100644 --- a/lib/icinga/dependency-apply.cpp +++ b/lib/icinga/dependency-apply.cpp @@ -132,7 +132,7 @@ bool Dependency::EvaluateApplyRule(const Checkable::Ptr& checkable, const ApplyR void Dependency::EvaluateApplyRules(const Host::Ptr& host) { - CONTEXT("Evaluating 'apply' rules for host '" + host->GetName() + "'"); + CONTEXT("Evaluating 'apply' rules for host '" << host->GetName() << "'"); for (auto& rule : ApplyRule::GetRules(Dependency::TypeInstance, Host::TypeInstance)) { if (EvaluateApplyRule(host, *rule)) @@ -147,7 +147,7 @@ void Dependency::EvaluateApplyRules(const Host::Ptr& host) void Dependency::EvaluateApplyRules(const Service::Ptr& service) { - CONTEXT("Evaluating 'apply' rules for service '" + service->GetName() + "'"); + CONTEXT("Evaluating 'apply' rules for service '" << service->GetName() << "'"); for (auto& rule : ApplyRule::GetRules(Dependency::TypeInstance, Service::TypeInstance)) { if (EvaluateApplyRule(service, *rule)) diff --git a/lib/icinga/hostgroup.cpp b/lib/icinga/hostgroup.cpp index a99d8ee54..a22f3b74c 100644 --- a/lib/icinga/hostgroup.cpp +++ b/lib/icinga/hostgroup.cpp @@ -22,7 +22,7 @@ bool HostGroup::EvaluateObjectRule(const Host::Ptr& host, const ConfigItem::Ptr& { String groupName = group->GetName(); - CONTEXT("Evaluating rule for group '" + groupName + "'"); + CONTEXT("Evaluating rule for group '" << groupName << "'"); ScriptFrame frame(true); if (group->GetScope()) @@ -45,7 +45,7 @@ bool HostGroup::EvaluateObjectRule(const Host::Ptr& host, const ConfigItem::Ptr& void HostGroup::EvaluateObjectRules(const Host::Ptr& host) { - CONTEXT("Evaluating group memberships for host '" + host->GetName() + "'"); + CONTEXT("Evaluating group memberships for host '" << host->GetName() << "'"); for (const ConfigItem::Ptr& group : ConfigItem::GetItems(HostGroup::TypeInstance)) { diff --git a/lib/icinga/macroprocessor.cpp b/lib/icinga/macroprocessor.cpp index 9d5f6425d..6fd30581c 100644 --- a/lib/icinga/macroprocessor.cpp +++ b/lib/icinga/macroprocessor.cpp @@ -76,7 +76,7 @@ Value MacroProcessor::ResolveMacros(const Value& str, const ResolverList& resolv bool MacroProcessor::ResolveMacro(const String& macro, const ResolverList& resolvers, const CheckResult::Ptr& cr, Value *result, bool *recursive_macro) { - CONTEXT("Resolving macro '" + macro + "'"); + CONTEXT("Resolving macro '" << macro << "'"); *recursive_macro = false; @@ -205,7 +205,7 @@ Value MacroProcessor::InternalResolveMacros(const String& str, const ResolverLis const MacroProcessor::EscapeCallback& escapeFn, const Dictionary::Ptr& resolvedMacros, bool useResolvedMacros, int recursionLevel) { - CONTEXT("Resolving macros for string '" + str + "'"); + CONTEXT("Resolving macros for string '" << str << "'"); if (recursionLevel > 15) BOOST_THROW_EXCEPTION(std::runtime_error("Infinite recursion detected while resolving macros")); diff --git a/lib/icinga/notification-apply.cpp b/lib/icinga/notification-apply.cpp index e49b457a5..f5b37643b 100644 --- a/lib/icinga/notification-apply.cpp +++ b/lib/icinga/notification-apply.cpp @@ -131,7 +131,7 @@ bool Notification::EvaluateApplyRule(const Checkable::Ptr& checkable, const Appl void Notification::EvaluateApplyRules(const Host::Ptr& host) { - CONTEXT("Evaluating 'apply' rules for host '" + host->GetName() + "'"); + CONTEXT("Evaluating 'apply' rules for host '" << host->GetName() << "'"); for (auto& rule : ApplyRule::GetRules(Notification::TypeInstance, Host::TypeInstance)) { @@ -147,7 +147,7 @@ void Notification::EvaluateApplyRules(const Host::Ptr& host) void Notification::EvaluateApplyRules(const Service::Ptr& service) { - CONTEXT("Evaluating 'apply' rules for service '" + service->GetName() + "'"); + CONTEXT("Evaluating 'apply' rules for service '" << service->GetName() << "'"); for (auto& rule : ApplyRule::GetRules(Notification::TypeInstance, Service::TypeInstance)) { if (EvaluateApplyRule(service, *rule)) diff --git a/lib/icinga/scheduleddowntime-apply.cpp b/lib/icinga/scheduleddowntime-apply.cpp index 3839ef3e8..4f8aa471f 100644 --- a/lib/icinga/scheduleddowntime-apply.cpp +++ b/lib/icinga/scheduleddowntime-apply.cpp @@ -130,7 +130,7 @@ bool ScheduledDowntime::EvaluateApplyRule(const Checkable::Ptr& checkable, const void ScheduledDowntime::EvaluateApplyRules(const Host::Ptr& host) { - CONTEXT("Evaluating 'apply' rules for host '" + host->GetName() + "'"); + CONTEXT("Evaluating 'apply' rules for host '" << host->GetName() << "'"); for (auto& rule : ApplyRule::GetRules(ScheduledDowntime::TypeInstance, Host::TypeInstance)) { if (EvaluateApplyRule(host, *rule)) @@ -145,7 +145,7 @@ void ScheduledDowntime::EvaluateApplyRules(const Host::Ptr& host) void ScheduledDowntime::EvaluateApplyRules(const Service::Ptr& service) { - CONTEXT("Evaluating 'apply' rules for service '" + service->GetName() + "'"); + CONTEXT("Evaluating 'apply' rules for service '" << service->GetName() << "'"); for (auto& rule : ApplyRule::GetRules(ScheduledDowntime::TypeInstance, Service::TypeInstance)) { if (EvaluateApplyRule(service, *rule)) diff --git a/lib/icinga/service-apply.cpp b/lib/icinga/service-apply.cpp index 673fe275f..4419e0b34 100644 --- a/lib/icinga/service-apply.cpp +++ b/lib/icinga/service-apply.cpp @@ -119,7 +119,7 @@ bool Service::EvaluateApplyRule(const Host::Ptr& host, const ApplyRule& rule, bo void Service::EvaluateApplyRules(const Host::Ptr& host) { - CONTEXT("Evaluating 'apply' rules for host '" + host->GetName() + "'"); + CONTEXT("Evaluating 'apply' rules for host '" << host->GetName() << "'"); for (auto& rule : ApplyRule::GetRules(Service::TypeInstance, Host::TypeInstance)) { if (EvaluateApplyRule(host, *rule)) diff --git a/lib/icinga/servicegroup.cpp b/lib/icinga/servicegroup.cpp index 8784b50a9..d21f852b9 100644 --- a/lib/icinga/servicegroup.cpp +++ b/lib/icinga/servicegroup.cpp @@ -22,7 +22,7 @@ bool ServiceGroup::EvaluateObjectRule(const Service::Ptr& service, const ConfigI { String groupName = group->GetName(); - CONTEXT("Evaluating rule for group '" + groupName + "'"); + CONTEXT("Evaluating rule for group '" << groupName << "'"); Host::Ptr host = service->GetHost(); @@ -48,7 +48,7 @@ bool ServiceGroup::EvaluateObjectRule(const Service::Ptr& service, const ConfigI void ServiceGroup::EvaluateObjectRules(const Service::Ptr& service) { - CONTEXT("Evaluating group membership for service '" + service->GetName() + "'"); + CONTEXT("Evaluating group membership for service '" << service->GetName() << "'"); for (const ConfigItem::Ptr& group : ConfigItem::GetItems(ServiceGroup::TypeInstance)) { diff --git a/lib/icinga/usergroup.cpp b/lib/icinga/usergroup.cpp index 49bd7186a..27ae45bb4 100644 --- a/lib/icinga/usergroup.cpp +++ b/lib/icinga/usergroup.cpp @@ -23,7 +23,7 @@ bool UserGroup::EvaluateObjectRule(const User::Ptr& user, const ConfigItem::Ptr& { String groupName = group->GetName(); - CONTEXT("Evaluating rule for group '" + groupName + "'"); + CONTEXT("Evaluating rule for group '" << groupName << "'"); ScriptFrame frame(true); if (group->GetScope()) @@ -46,7 +46,7 @@ bool UserGroup::EvaluateObjectRule(const User::Ptr& user, const ConfigItem::Ptr& void UserGroup::EvaluateObjectRules(const User::Ptr& user) { - CONTEXT("Evaluating group membership for user '" + user->GetName() + "'"); + CONTEXT("Evaluating group membership for user '" << user->GetName() << "'"); for (const ConfigItem::Ptr& group : ConfigItem::GetItems(UserGroup::TypeInstance)) { diff --git a/lib/perfdata/elasticsearchwriter.cpp b/lib/perfdata/elasticsearchwriter.cpp index 0ac997749..2fdd17b7a 100644 --- a/lib/perfdata/elasticsearchwriter.cpp +++ b/lib/perfdata/elasticsearchwriter.cpp @@ -211,7 +211,7 @@ void ElasticsearchWriter::InternalCheckResultHandler(const Checkable::Ptr& check { AssertOnWorkQueue(); - CONTEXT("Elasticwriter processing check result for '" + checkable->GetName() + "'"); + CONTEXT("Elasticwriter processing check result for '" << checkable->GetName() << "'"); if (!IcingaApplication::GetInstance()->GetEnablePerfdata() || !checkable->GetEnablePerfdata()) return; @@ -268,7 +268,7 @@ void ElasticsearchWriter::StateChangeHandlerInternal(const Checkable::Ptr& check { AssertOnWorkQueue(); - CONTEXT("Elasticwriter processing state change '" + checkable->GetName() + "'"); + CONTEXT("Elasticwriter processing state change '" << checkable->GetName() << "'"); Host::Ptr host; Service::Ptr service; @@ -324,7 +324,7 @@ void ElasticsearchWriter::NotificationSentToAllUsersHandlerInternal(const Notifi { AssertOnWorkQueue(); - CONTEXT("Elasticwriter processing notification to all users '" + checkable->GetName() + "'"); + CONTEXT("Elasticwriter processing notification to all users '" << checkable->GetName() << "'"); Log(LogDebug, "ElasticsearchWriter") << "Processing notification for '" << checkable->GetName() << "'"; diff --git a/lib/perfdata/gelfwriter.cpp b/lib/perfdata/gelfwriter.cpp index 843f56a1e..99b8a3933 100644 --- a/lib/perfdata/gelfwriter.cpp +++ b/lib/perfdata/gelfwriter.cpp @@ -162,7 +162,7 @@ void GelfWriter::ReconnectInternal() { double startTime = Utility::GetTime(); - CONTEXT("Reconnecting to Graylog Gelf '" + GetName() + "'"); + CONTEXT("Reconnecting to Graylog Gelf '" << GetName() << "'"); SetShouldConnect(true); @@ -276,7 +276,7 @@ void GelfWriter::CheckResultHandlerInternal(const Checkable::Ptr& checkable, con { AssertOnWorkQueue(); - CONTEXT("GELF Processing check result for '" + checkable->GetName() + "'"); + CONTEXT("GELF Processing check result for '" << checkable->GetName() << "'"); Log(LogDebug, "GelfWriter") << "Processing check result for '" << checkable->GetName() << "'"; @@ -388,7 +388,7 @@ void GelfWriter::NotificationToUserHandlerInternal(const Notification::Ptr& noti { AssertOnWorkQueue(); - CONTEXT("GELF Processing notification to all users '" + checkable->GetName() + "'"); + CONTEXT("GELF Processing notification to all users '" << checkable->GetName() << "'"); Log(LogDebug, "GelfWriter") << "Processing notification for '" << checkable->GetName() << "'"; @@ -452,7 +452,7 @@ void GelfWriter::StateChangeHandlerInternal(const Checkable::Ptr& checkable, con { AssertOnWorkQueue(); - CONTEXT("GELF Processing state change '" + checkable->GetName() + "'"); + CONTEXT("GELF Processing state change '" << checkable->GetName() << "'"); Log(LogDebug, "GelfWriter") << "Processing state change for '" << checkable->GetName() << "'"; diff --git a/lib/perfdata/graphitewriter.cpp b/lib/perfdata/graphitewriter.cpp index fc1c7edff..4b9424e80 100644 --- a/lib/perfdata/graphitewriter.cpp +++ b/lib/perfdata/graphitewriter.cpp @@ -181,7 +181,7 @@ void GraphiteWriter::ReconnectInternal() { double startTime = Utility::GetTime(); - CONTEXT("Reconnecting to Graphite '" + GetName() + "'"); + CONTEXT("Reconnecting to Graphite '" << GetName() << "'"); SetShouldConnect(true); @@ -276,7 +276,7 @@ void GraphiteWriter::CheckResultHandlerInternal(const Checkable::Ptr& checkable, { AssertOnWorkQueue(); - CONTEXT("Processing check result for '" + checkable->GetName() + "'"); + CONTEXT("Processing check result for '" << checkable->GetName() << "'"); /* TODO: Deal with missing connection here. Needs refactoring * into parsing the actual performance data and then putting it diff --git a/lib/perfdata/influxdbcommonwriter.cpp b/lib/perfdata/influxdbcommonwriter.cpp index a42d9e182..fcadd799f 100644 --- a/lib/perfdata/influxdbcommonwriter.cpp +++ b/lib/perfdata/influxdbcommonwriter.cpp @@ -210,7 +210,7 @@ void InfluxdbCommonWriter::CheckResultHandlerWQ(const Checkable::Ptr& checkable, { AssertOnWorkQueue(); - CONTEXT("Processing check result for '" + checkable->GetName() + "'"); + CONTEXT("Processing check result for '" << checkable->GetName() << "'"); if (!IcingaApplication::GetInstance()->GetEnablePerfdata() || !checkable->GetEnablePerfdata()) return; diff --git a/lib/perfdata/opentsdbwriter.cpp b/lib/perfdata/opentsdbwriter.cpp index 2d5720ec0..066377ab1 100644 --- a/lib/perfdata/opentsdbwriter.cpp +++ b/lib/perfdata/opentsdbwriter.cpp @@ -158,7 +158,7 @@ void OpenTsdbWriter::CheckResultHandler(const Checkable::Ptr& checkable, const C if (IsPaused()) return; - CONTEXT("Processing check result for '" + checkable->GetName() + "'"); + CONTEXT("Processing check result for '" << checkable->GetName() << "'"); if (!IcingaApplication::GetInstance()->GetEnablePerfdata() || !checkable->GetEnablePerfdata()) return; diff --git a/lib/perfdata/perfdatawriter.cpp b/lib/perfdata/perfdatawriter.cpp index bb6fda3a2..77652b1da 100644 --- a/lib/perfdata/perfdatawriter.cpp +++ b/lib/perfdata/perfdatawriter.cpp @@ -99,7 +99,7 @@ void PerfdataWriter::CheckResultHandler(const Checkable::Ptr& checkable, const C if (IsPaused()) return; - CONTEXT("Writing performance data for object '" + checkable->GetName() + "'"); + CONTEXT("Writing performance data for object '" << checkable->GetName() << "'"); if (!IcingaApplication::GetInstance()->GetEnablePerfdata() || !checkable->GetEnablePerfdata()) return; diff --git a/lib/remote/apilistener-filesync.cpp b/lib/remote/apilistener-filesync.cpp index c181c6d2b..77af960f4 100644 --- a/lib/remote/apilistener-filesync.cpp +++ b/lib/remote/apilistener-filesync.cpp @@ -817,7 +817,7 @@ void ApiListener::ConfigGlobHandler(ConfigDirInformation& config, const String& if (Utility::BaseName(file) == ".authoritative") return; - CONTEXT("Creating config update for file '" + file + "'"); + CONTEXT("Creating config update for file '" << file << "'"); Log(LogNotice, "ApiListener") << "Creating config update for file '" << file << "'."; diff --git a/lib/remote/apilistener.cpp b/lib/remote/apilistener.cpp index 2e1bb3a0e..f8be377b4 100644 --- a/lib/remote/apilistener.cpp +++ b/lib/remote/apilistener.cpp @@ -1400,7 +1400,7 @@ void ApiListener::ReplayLog(const JsonRpcConnection::Ptr& client) return; } - CONTEXT("Replaying log for Endpoint '" + endpoint->GetName() + "'"); + CONTEXT("Replaying log for Endpoint '" << endpoint->GetName() << "'"); int count = -1; double peer_ts = endpoint->GetLocalLogPosition();