Module: check_mk
Branch: master
Commit: cfac18369cf1787947b1a64ab7d86f82dd6dfb5a
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cfac18369cf178…
Author: Sergey Kipnis <sk(a)mathias-kettner.de>
Date: Thu Mar 28 16:33:09 2019 +0100
[CMK-1791] - trace output
Change-Id: I9d074f480c2dee863813962eb19b91ed274b141d
---
agents/wnx/src/engine/async_answer.cpp | 9 +++------
agents/wnx/src/engine/carrier.cpp | 1 +
agents/wnx/src/engine/service_processor.h | 6 ++++--
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/agents/wnx/src/engine/async_answer.cpp
b/agents/wnx/src/engine/async_answer.cpp
index b29565c..5cc02a5 100644
--- a/agents/wnx/src/engine/async_answer.cpp
+++ b/agents/wnx/src/engine/async_answer.cpp
@@ -102,14 +102,13 @@ bool AsyncAnswer::addSegment(
) {
std::lock_guard lk(lock_);
if (Id != tp_id_) {
- xlog::d("Invalid attempt to add data");
+ XLOG::d("Invalid attempt to add data '{}'", SectionName);
return false;
}
for (const auto& s : segments_) {
if (s.name_ == SectionName) {
- xlog::l("Section %s tries to store data twice. F-f",
- SectionName.c_str());
+ XLOG::l("Section '{}' tries to store data twice. F-f",
SectionName);
return false; // duplicated section run
}
}
@@ -122,7 +121,7 @@ bool AsyncAnswer::addSegment(
}
} catch (const std::exception& e) {
// not possible, but we have to check
- xlog::l(XLOG_FLINE + "-exception %s", e.what());
+ XLOG::l(XLOG_FLINE + "-exception '{}'", e.what());
}
received_segments_++;
@@ -136,8 +135,6 @@ bool AsyncAnswer::addSegment(
return true;
}
-
-
// resets data, internal use only
void AsyncAnswer::dropDataNoLock() {
tp_id_ = GenerateAnswerId();
diff --git a/agents/wnx/src/engine/carrier.cpp b/agents/wnx/src/engine/carrier.cpp
index 83e0237..9678aa0 100644
--- a/agents/wnx/src/engine/carrier.cpp
+++ b/agents/wnx/src/engine/carrier.cpp
@@ -80,6 +80,7 @@ bool CoreCarrier::establishCommunication(const std::string&
InternalPort) {
bool CoreCarrier::sendData(const std::string& PeerName, uint64_t Marker,
const void* Data, size_t Length) {
std::lock_guard lk(lock_);
+ XLOG::d.t("Sending data '{}' id is [{}] length [{}]", PeerName,
Marker, Length);
return sendDataDispatcher(DataType::kSegment, PeerName, Marker, Data,
Length);
}
diff --git a/agents/wnx/src/engine/service_processor.h
b/agents/wnx/src/engine/service_processor.h
index 645a7e1..ae9d925 100644
--- a/agents/wnx/src/engine/service_processor.h
+++ b/agents/wnx/src/engine/service_processor.h
@@ -255,6 +255,8 @@ private:
cma::OnStartApp();
auto tp = openAnswer(Ip);
if (tp) {
+ XLOG::d.i("Id is [{}] ",
+ tp.value().time_since_epoch().count());
auto started = startProviders(tp.value(), Ip);
return getAnswer(started);
@@ -487,10 +489,10 @@ private:
[this](const AnswerId Tp, ServiceProcessor* Proc) {
auto block = gatherData();
if (block) {
- XLOG::d("Provider {} added answer", name_);
+ XLOG::d("Provider '{}' added answer", name_);
return Proc->addSectionToAnswer(name_, Tp, *block);
} else {
- XLOG::l("Provider {} FAILED answer", name_);
+ XLOG::l("Provider '{}' FAILED answer", name_);
Proc->addSectionToAnswer(name_, Tp);
return false;
}