From a126bd16d442f46e4829d1eef05fcdf6878c05d3 Mon Sep 17 00:00:00 2001 From: WolverinDEV Date: Thu, 2 Apr 2020 01:19:36 +0200 Subject: [PATCH] Removed spamy debugging messages --- .../src/connection/ProtocolHandler.cpp | 10 +++++----- .../src/connection/ProtocolHandlerPackets.cpp | 4 ++-- .../src/connection/ServerConnection.cpp | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/native/serverconnection/src/connection/ProtocolHandler.cpp b/native/serverconnection/src/connection/ProtocolHandler.cpp index 46141fe..9a48137 100644 --- a/native/serverconnection/src/connection/ProtocolHandler.cpp +++ b/native/serverconnection/src/connection/ProtocolHandler.cpp @@ -139,7 +139,7 @@ void ProtocolHandler::execute_resend() { this->handle->close_connection(); return; } - log_trace(category::connection, tr("Resended {}"), resended); + //log_trace(category::connection, tr("Resended {}"), resended); auto socket = this->handle->get_socket(); if(socket) { @@ -165,7 +165,7 @@ void ProtocolHandler::progress_packet(const pipes::buffer_view &buffer) { auto packet_type = packet->type(); auto packet_id = packet->packetId(); auto ordered = packet_type.type() == protocol::COMMAND || packet_type.type() == protocol::COMMAND_LOW; - log_trace(category::connection, tr("Received packet {} with id {}"), packet->type().name(), packet->packetId()); + //log_trace(category::connection, tr("Received packet {} with id {}"), packet->type().name(), packet->packetId()); /* special handling */ if(packet_type.type() == protocol::INIT1) { @@ -255,7 +255,7 @@ void ProtocolHandler::progress_packet(const pipes::buffer_view &buffer) { unique_lock queue_lock(read_queue.buffer_lock); if(ordered) { /* ordered */ - log_trace(category::connection, tr("Inserting packet {} with id {}"), packet->type().name(), packet->packetId()); + //log_trace(category::connection, tr("Inserting packet {} with id {}"), packet->type().name(), packet->packetId()); if(!read_queue.insert_index(packet_id, std::forward>(packet))) { log_warn(category::connection, tr("Failed to insert ordered packet into queue. ({} | {} | {})"), packet_type.name(), read_queue.current_index(), packet_id); } @@ -530,7 +530,7 @@ void ProtocolHandler::send_command(const ts::Command &cmd, const std::function(end - begin).count(), f); + //log_trace(category::connection, tr("Time needed for command: {}ms. Success: {}"), chrono::duration_cast(end - begin).count(), f); }); } packet->enable_flag(PacketFlag::NewProtocol); @@ -555,7 +555,7 @@ void ProtocolHandler::send_packet(const std::shared_ptrpacketId(), packet->type().name(), result.size(), this->acknowledge_handler.awaiting_acknowledge()); + //log_trace(category::connection, tr("Split up {} {} to {} packets. Ack waiting: {}"), packet->packetId(), packet->type().name(), result.size(), this->acknowledge_handler.awaiting_acknowledge()); auto socket = this->handle->get_socket(); if(!socket) { log_error(category::connection, tr("Failed to get socket!")); diff --git a/native/serverconnection/src/connection/ProtocolHandlerPackets.cpp b/native/serverconnection/src/connection/ProtocolHandlerPackets.cpp index bb28407..a4c356e 100644 --- a/native/serverconnection/src/connection/ProtocolHandlerPackets.cpp +++ b/native/serverconnection/src/connection/ProtocolHandlerPackets.cpp @@ -18,7 +18,7 @@ using namespace ts; void ProtocolHandler::handlePacketAck(const std::shared_ptr &ack) { string error; - log_trace(category::connection, tr("Handle packet acknowledge for {}"), be2le16(&ack->data()[0])); + //log_trace(category::connection, tr("Handle packet acknowledge for {}"), be2le16(&ack->data()[0])); if(!this->acknowledge_handler.process_acknowledge(ack->type().type(), ack->data(), error)) { log_warn(category::connection, tr("Failed to handle acknowledge {}: {}"), be2le16(&ack->data()[0]) ,error); } @@ -35,7 +35,7 @@ void ProtocolHandler::handlePacketCommand(const std::shared_ptrcommand()); + //log_trace(category::connection, tr("Handing command {}"), command->command()); if(command->command() == "initivexpand") { this->handleCommandInitIVExpend(*command); diff --git a/native/serverconnection/src/connection/ServerConnection.cpp b/native/serverconnection/src/connection/ServerConnection.cpp index ab6eb6a..39a4cc2 100644 --- a/native/serverconnection/src/connection/ServerConnection.cpp +++ b/native/serverconnection/src/connection/ServerConnection.cpp @@ -496,7 +496,7 @@ NAN_METHOD(ServerConnection::send_command) { cmd[strobf("hwid").string()] = system_uuid(); /* we dont want anybody to patch this out */ } } - log_trace(category::audio, tr("Sending data {}"), cmd.command()); + this->protocol_handler->send_command(cmd); auto end = chrono::system_clock::now(); }