From 9e61664276d1a359a367617aa07eb4da136600c7 Mon Sep 17 00:00:00 2001
From: Hoop77 <p.badenhoop@gmx.de>
Date: Tue, 8 May 2018 19:52:35 +0200
Subject: [PATCH] -
---
modules/catkin_ws/src/PC/src/Logger.cpp | 4 +++-
modules/catkin_ws/src/PC/src/main.cpp | 1 -
modules/catkin_ws/src/car/src/logging/Logging.cpp | 3 ---
3 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/modules/catkin_ws/src/PC/src/Logger.cpp b/modules/catkin_ws/src/PC/src/Logger.cpp
index e8cb7d91..51b53c84 100644
--- a/modules/catkin_ws/src/PC/src/Logger.cpp
+++ b/modules/catkin_ws/src/PC/src/Logger.cpp
@@ -36,7 +36,9 @@ void Logger::log(AsyncState::Ptr state)
emptyRequest, host, PORT, 10s,
[state](const auto & error, auto & responseMessage)
{
- std::cout << responseMessage;
+ if (!responseMessage.empty())
+ std::cout << responseMessage << "\n";
+
state->self->timer->startTimeout(1ms, [state]
{ state->self->log(state); });
});
diff --git a/modules/catkin_ws/src/PC/src/main.cpp b/modules/catkin_ws/src/PC/src/main.cpp
index 4ca09fdc..79ec8f95 100644
--- a/modules/catkin_ws/src/PC/src/main.cpp
+++ b/modules/catkin_ws/src/PC/src/main.cpp
@@ -1,5 +1,4 @@
#include "PC2CarLib/CommandSender.h"
-#include "NetworkingLib/ServiceClient.h"
#include "../include/Logger.h"
int main()
diff --git a/modules/catkin_ws/src/car/src/logging/Logging.cpp b/modules/catkin_ws/src/car/src/logging/Logging.cpp
index 68064251..9c6c26a7 100644
--- a/modules/catkin_ws/src/car/src/logging/Logging.cpp
+++ b/modules/catkin_ws/src/car/src/logging/Logging.cpp
@@ -49,9 +49,6 @@ void Logging::onInit()
loggingServer->advertiseService(
[this](const auto & clientEndpoint, auto & requestMessage, auto & responseMessage)
{
- std::cout << "\n----------------------------\n"
- << "!!! CONNECTED !!!\n"
- << "\n----------------------------\n\n";
std::lock_guard<std::mutex> lock{loggingMutex};
responseMessage = networking::utils::stringFromStreambuf(
loggingBuffer, std::min(loggingBuffer.size(), MAX_MESSAGE_SIZE));
--
GitLab