You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ab...@apache.org on 2021/05/10 23:28:15 UTC

[nifi-minifi-cpp] 02/02: MINIFICPP-1554 - Log c2 response code

This is an automated email from the ASF dual-hosted git repository.

aboda pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git

commit cf4dbd926b70fb61826c77290ea12211c151555b
Author: Adam Debreceni <ad...@apache.org>
AuthorDate: Tue May 4 16:09:36 2021 +0200

    MINIFICPP-1554 - Log c2 response code
    
    Signed-off-by: Arpad Boda <ab...@apache.org>
    
    This closes #1068
---
 extensions/http-curl/protocols/RESTSender.cpp | 9 ++++++++-
 extensions/mqtt/protocol/MQTTC2Protocol.cpp   | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/extensions/http-curl/protocols/RESTSender.cpp b/extensions/http-curl/protocols/RESTSender.cpp
index 0f831e3..7f41c4a 100644
--- a/extensions/http-curl/protocols/RESTSender.cpp
+++ b/extensions/http-curl/protocols/RESTSender.cpp
@@ -38,7 +38,7 @@ namespace c2 {
 
 RESTSender::RESTSender(const std::string &name, const utils::Identifier &uuid)
     : C2Protocol(name, uuid),
-      logger_(logging::LoggerFactory<Connectable>::getLogger()) {
+      logger_(logging::LoggerFactory<RESTSender>::getLogger()) {
 }
 
 void RESTSender::initialize(core::controller::ControllerServiceProvider* controller, const std::shared_ptr<Configure> &configure) {
@@ -139,6 +139,13 @@ const C2Payload RESTSender::sendPayload(const std::string url, const Direction d
   }
   bool isOkay = client.submit();
   int64_t respCode = client.getResponseCode();
+  const bool clientError = 400 <= respCode && respCode < 500;
+  const bool serverError = 500 <= respCode && respCode < 600;
+  if (clientError || serverError) {
+    logger_->log_error("Error response code '" "%" PRId64 "' from '%s'", respCode, url);
+  } else {
+    logger_->log_debug("Response code '" "%" PRId64 "' from '%s'", respCode, url);
+  }
   auto rs = client.getResponseBody();
   if (isOkay && respCode) {
     if (payload.isRaw()) {
diff --git a/extensions/mqtt/protocol/MQTTC2Protocol.cpp b/extensions/mqtt/protocol/MQTTC2Protocol.cpp
index 79acf77..d50f8cb 100644
--- a/extensions/mqtt/protocol/MQTTC2Protocol.cpp
+++ b/extensions/mqtt/protocol/MQTTC2Protocol.cpp
@@ -25,7 +25,7 @@ namespace c2 {
 
 MQTTC2Protocol::MQTTC2Protocol(const std::string& name, const utils::Identifier& uuid)
     : C2Protocol(name, uuid),
-      logger_(logging::LoggerFactory<Connectable>::getLogger()) {
+      logger_(logging::LoggerFactory<MQTTC2Protocol>::getLogger()) {
 }
 
 MQTTC2Protocol::~MQTTC2Protocol() = default;