8 files changed, 8 insertions(+), 16 deletions(-)

M module-services/service-desktop/ServiceDesktop.cpp
M module-services/service-desktop/WorkerDesktop.cpp
M module-services/service-desktop/endpoints/backup/BackupEndpoint.cpp
M module-services/service-desktop/endpoints/calendarEvents/CalendarEventsHelper.cpp
M module-services/service-desktop/endpoints/messages/MessageHelper.cpp
M module-services/service-desktop/endpoints/restore/RestoreEndpoint.cpp
M module-services/service-desktop/parser/MessageHandler.cpp
M module-services/service-desktop/parser/ParserFSM.cpp

@@ 308,7 308,6 @@ sys::MessagePointer ServiceDesktop::DataReceivedHandler(sys::DataMessage *msg, s
             if (auto queryResponse = dynamic_cast<db::QueryResponse *>(resp)) {
                 auto result = queryResponse->getResult();
                 if (result != nullptr) {
-                    LOG_DEBUG("Result: %s", result->debugInfo().c_str());
                     if (result->hasListener()) {
                         LOG_DEBUG("Handling result...");
                         result->handle();

@@ 80,8 80,6 @@ bool WorkerDesktop::handleMessage(uint32_t queueID)
     auto &queue       = queues[queueID];
     const auto &qname = queue->GetQueueName();
 
-    LOG_INFO("handleMessage received data from queue: %s", qname.c_str());
-
     if (qname == sdesktop::RECEIVE_QUEUE_BUFFER_NAME) {
         std::string *receivedMsg = nullptr;
         if (!queue->Dequeue(&receivedMsg, 0)) {

@@ 70,7 70,7 @@ auto BackupEndpoint::request(Context &context) -> sys::ReturnCodes
         context.setResponseStatus(parserFSM::http::Code::BadRequest);
     }
 
-    LOG_DEBUG("responding: %s", context.createSimpleResponse().c_str());
+    LOG_DEBUG("responding");
     MessageHandler::putToSendQueue(context.createSimpleResponse());
 
     return sys::ReturnCodes::Success;

@@ 200,7 200,7 @@ auto CalendarEventsHelper::eventJsonObjectFrom(const EventsRecord &record) const
 {
     auto icalEvent = icalEventFrom(record);
     if (!isICalEventValid(icalEvent)) {
-        LOG_ERROR("Bad event record formatting  (Event UID: %s)", icalEvent.event.getUID().c_str());
+        LOG_ERROR("Bad event record formatting");
     }
 
     auto rruleObj = json11::Json::object{


@@ 375,7 375,7 @@ auto CalendarEventsHelper::createDBEntry(Context &context) -> sys::ReturnCodes
             context.setResponseBody(jsonObj);
         }
         else {
-            LOG_ERROR("UID should not be recieved in put event endpoint. Recieved UID: %s", record.UID.c_str());
+            LOG_ERROR("UID should not be recieved in put event endpoint.");
             context.setResponseStatus(http::Code::BadRequest);
             MessageHandler::putToSendQueue(context.createSimpleResponse());
             return sys::ReturnCodes::Failure;


@@ 457,7 457,7 @@ auto CalendarEventsHelper::deleteDBEntry(Context &context) -> sys::ReturnCodes
     auto checkUID = Event();
     checkUID.setUID(UID);
     if (!checkUID.isValid) {
-        LOG_ERROR("Wrong UID format. Provided UID: %s", UID.c_str());
+        LOG_ERROR("Wrong UID format.");
         context.setResponseStatus(http::Code::BadRequest);
         MessageHandler::putToSendQueue(context.createSimpleResponse());
         return sys::ReturnCodes::Failure;

@@ 552,7 552,6 @@ namespace parserFSM
                         smsArray.reserve(results.size());
                         for (const auto &record : results) {
                             smsArray.emplace_back(MessageHelper::toJson(record));
-                            LOG_DEBUG("Record found!: %" PRIu32 "\n", record.ID);
                         }
 
                         context.setResponseBody(std::move(smsArray));

@@ 87,7 87,7 @@ auto RestoreEndpoint::request(Context &context) -> sys::ReturnCodes
         context.setResponseStatus(parserFSM::http::Code::BadRequest);
     }
 
-    LOG_DEBUG("responding: %s", context.createSimpleResponse().c_str());
+    LOG_DEBUG("responding");
     MessageHandler::putToSendQueue(context.createSimpleResponse());
 
     return sys::ReturnCodes::Success;

@@ 39,11 39,10 @@ void MessageHandler::processMessage()
 {
     auto context = ContextFactory::create(messageJson);
 
-    LOG_DEBUG("[MsgHandler]\nmethod: %d\nendpoint: %d\nuuid: %d\nbody: %s\n",
+    LOG_DEBUG("[MsgHandler]\nmethod: %d\nendpoint: %d\nuuid: %d\n",
               static_cast<int>(context->getMethod()),
               static_cast<int>(context->getEndpoint()),
-              context->getUuid(),
-              context->getBody().dump().c_str());
+              context->getUuid());
 
     auto handler = endpointFactory->create(*context, OwnerServicePtr);
 


@@ 59,7 58,6 @@ void MessageHandler::putToSendQueue(const std::string &msg)
 {
     if (uxQueueSpacesAvailable(sendQueue) != 0) {
         auto responseString = new std::string(msg);
-        LOG_DEBUG("%s", responseString->c_str());
         xQueueSend(sendQueue, &responseString, portMAX_DELAY);
     }
 }

@@ 30,7 30,6 @@ StateMachine::StateMachine(sys::Service *OwnerService) : OwnerServicePtr(OwnerSe
 void StateMachine::processMessage(std::string &&msg)
 {
     receivedMsg = std::move(msg);
-    LOG_DEBUG("Msg: %s", receivedMsg.c_str());
 
     switch (state) {
     case State::ReceivedPayload:


@@ 151,7 150,6 @@ void StateMachine::parsePartialMessage()
 
 void StateMachine::parsePayload()
 {
-    LOG_DEBUG("Payload: %s", payload.c_str());
     if (payload.empty()) {
         LOG_ERROR("Empty payload!");
         state = State::NoMsg;


@@ 163,7 161,7 @@ void StateMachine::parsePayload()
     messageHandler->parseMessage(payload);
 
     if (!messageHandler->isValid() || messageHandler->isJSONNull()) {
-        LOG_DEBUG("JsonErr: %s", messageHandler->getErrorString().c_str());
+        LOG_DEBUG("Error parsing JSON");
         state = State::NoMsg;
         return;
     }