From 0c4b5a864e4ed5ffce4f880c66efafcae838392f Mon Sep 17 00:00:00 2001 From: Nav Date: Sun, 24 Apr 2022 16:48:26 +0100 Subject: [PATCH] Improved debug logging in TC CommandManager --- src/TargetController/CommandManager.hpp | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/TargetController/CommandManager.hpp b/src/TargetController/CommandManager.hpp index 22fc347b..26832e7c 100644 --- a/src/TargetController/CommandManager.hpp +++ b/src/TargetController/CommandManager.hpp @@ -28,9 +28,11 @@ namespace Bloom::TargetController ) { using SuccessResponseType = typename CommandType::SuccessResponseType; - Logger::debug("Issuing " + CommandType::name + " command to TargetController"); - const auto commandId = command->id; + Logger::debug( + "Issuing " + CommandType::name + " command (ID: " + std::to_string(commandId) + ") to TargetController" + ); + TargetControllerComponent::registerCommand(std::move(command)); auto optionalResponse = TargetControllerComponent::waitForResponse(commandId, timeout); @@ -48,12 +50,16 @@ namespace Bloom::TargetController const auto errorResponse = dynamic_cast(response.get()); Logger::debug( - "TargetController returned error in response to " + CommandType::name + " command. Error: " - + errorResponse->errorMessage + "TargetController returned error in response to " + CommandType::name + " command (ID: " + + std::to_string(commandId) + "). Error: " + errorResponse->errorMessage ); throw Exceptions::Exception(errorResponse->errorMessage); } + Logger::debug( + "Delivering response for " + CommandType::name + " command (ID: " + std::to_string(commandId) + ")" + ); + // Only downcast if the command's SuccessResponseType is not the generic Response type. if constexpr (!std::is_same_v) { assert(response->getType() == SuccessResponseType::type); @@ -64,7 +70,6 @@ namespace Bloom::TargetController } else { return std::move(response); } - } }; }