Repository: nifi-minifi-cpp Updated Branches: refs/heads/master 8ddaea079 -> 56b6512d1
MINIFICPP-626 - Log proper error message in case S2S handshake fails. This closes #407. Signed-off-by: Marc Parisi <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/commit/56b6512d Tree: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/tree/56b6512d Diff: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/diff/56b6512d Branch: refs/heads/master Commit: 56b6512d15bbf77276e1cf6ef9a334023b3f72f3 Parents: 8ddaea0 Author: Arpad Boda <[email protected]> Authored: Tue Oct 2 16:06:26 2018 +0200 Committer: Marc Parisi <[email protected]> Committed: Tue Oct 2 10:38:30 2018 -0400 ---------------------------------------------------------------------- libminifi/src/sitetosite/RawSocketProtocol.cpp | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/blob/56b6512d/libminifi/src/sitetosite/RawSocketProtocol.cpp ---------------------------------------------------------------------- diff --git a/libminifi/src/sitetosite/RawSocketProtocol.cpp b/libminifi/src/sitetosite/RawSocketProtocol.cpp index 9b17db1..c0bf499 100644 --- a/libminifi/src/sitetosite/RawSocketProtocol.cpp +++ b/libminifi/src/sitetosite/RawSocketProtocol.cpp @@ -299,23 +299,32 @@ bool RawSiteToSiteClient::handShake() { return false; } + std::string error; + switch (code) { case PROPERTIES_OK: logger_->log_debug("Site2Site HandShake Completed"); peer_state_ = HANDSHAKED; return true; case PORT_NOT_IN_VALID_STATE: + error = "in invalid state"; + break; case UNKNOWN_PORT: + error = "an unknown port"; + break; case PORTS_DESTINATION_FULL: - logger_->log_error("Site2Site HandShake Failed because destination port, %s, is either invalid or full", port_id_str_); - ret = -1; - return false; + error = "full"; + break; + // Unknown error default: logger_->log_error("HandShake Failed because of unknown respond code %d", code); ret = -1; return false; } + // All known error cases handled here + logger_->log_error("Site2Site HandShake Failed because destination port, %s, is %s", port_id_str_, error); + ret = -1; return false; }
