You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by fg...@apache.org on 2022/04/28 14:20:47 UTC
[nifi-minifi-cpp] 03/03: MINIFICPP-1808 Improve RawSocketProtocol authorization error logging
This is an automated email from the ASF dual-hosted git repository.
fgerlits pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
commit 863f5d85d81e88c1a46737d7f2fcbd4d62a1d748
Author: Martin Zink <ma...@apache.org>
AuthorDate: Thu Apr 21 12:01:45 2022 +0200
MINIFICPP-1808 Improve RawSocketProtocol authorization error logging
Signed-off-by: Ferenc Gerlits <fg...@gmail.com>
This close #1314
---
libminifi/src/sitetosite/RawSocketProtocol.cpp | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/libminifi/src/sitetosite/RawSocketProtocol.cpp b/libminifi/src/sitetosite/RawSocketProtocol.cpp
index 28f037b89..ebe7230b3 100644
--- a/libminifi/src/sitetosite/RawSocketProtocol.cpp
+++ b/libminifi/src/sitetosite/RawSocketProtocol.cpp
@@ -310,7 +310,9 @@ bool RawSiteToSiteClient::handShake() {
}
}
- std::string error;
+ auto logPortStateError = [this](const std::string& error) {
+ logger_->log_error("Site2Site HandShake Failed because destination port, %s, is %s", port_id_.to_string(), error);
+ };
switch (code) {
case PROPERTIES_OK:
@@ -318,23 +320,21 @@ bool RawSiteToSiteClient::handShake() {
peer_state_ = HANDSHAKED;
return true;
case PORT_NOT_IN_VALID_STATE:
- error = "in invalid state";
- break;
+ logPortStateError("in invalid state");
+ return false;
case UNKNOWN_PORT:
- error = "an unknown port";
- break;
+ logPortStateError("an unknown port");
+ return false;
case PORTS_DESTINATION_FULL:
- error = "full";
- break;
- // Unknown error
+ logPortStateError("full");
+ return false;
+ case UNAUTHORIZED:
+ logger_->log_error("Site2Site HandShake on port %s failed: UNAUTHORIZED", port_id_.to_string());
+ return false;
default:
- logger_->log_error("HandShake Failed because of unknown respond code %d", code);
+ logger_->log_error("Site2Site HandShake on port %s failed: unknown respond code %d", port_id_.to_string(), code);
return false;
}
-
- // All known error cases handled here
- logger_->log_error("Site2Site HandShake Failed because destination port, %s, is %s", port_id_.to_string(), error);
- return false;
}
void RawSiteToSiteClient::tearDown() {