You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by al...@apache.org on 2017/09/12 17:51:26 UTC
[03/11] nifi-minifi-cpp git commit: MINIFI-375: Remove forward slash
from urls
MINIFI-375: Remove forward slash from urls
This closes #127.
Signed-off-by: Aldrin Piri <al...@apache.org>
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/95343203
Tree: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/tree/95343203
Diff: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/diff/95343203
Branch: refs/heads/master
Commit: 953432038acbef807789ad7bbcc01240b16fc90d
Parents: 8ea91a1
Author: Marc Parisi <ph...@apache.org>
Authored: Tue Aug 15 15:05:41 2017 -0400
Committer: Aldrin Piri <al...@apache.org>
Committed: Tue Sep 12 13:51:03 2017 -0400
----------------------------------------------------------------------
libminifi/src/RemoteProcessorGroupPort.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/blob/95343203/libminifi/src/RemoteProcessorGroupPort.cpp
----------------------------------------------------------------------
diff --git a/libminifi/src/RemoteProcessorGroupPort.cpp b/libminifi/src/RemoteProcessorGroupPort.cpp
index 3c88e8f..05d5f7a 100644
--- a/libminifi/src/RemoteProcessorGroupPort.cpp
+++ b/libminifi/src/RemoteProcessorGroupPort.cpp
@@ -212,7 +212,7 @@ void RemoteProcessorGroupPort::refreshRemoteSite2SiteInfo() {
if (this->host_.empty() || this->port_ == -1 || this->protocol_.empty())
return;
- std::string fullUrl = this->protocol_ + this->host_ + ":" + std::to_string(this->port_) + "/nifi-api/controller/";
+ std::string fullUrl = this->protocol_ + this->host_ + ":" + std::to_string(this->port_) + "/nifi-api/controller";
this->site2site_port_ = -1;
configure_->get(Configure::nifi_rest_api_user_name, this->rest_user_name_);
@@ -221,7 +221,7 @@ void RemoteProcessorGroupPort::refreshRemoteSite2SiteInfo() {
std::string token;
if (!rest_user_name_.empty()) {
- std::string loginUrl = this->protocol_ + this->host_ + ":" + std::to_string(this->port_) + "/nifi-api/access/token/";
+ std::string loginUrl = this->protocol_ + this->host_ + ":" + std::to_string(this->port_) + "/nifi-api/access/token";
token = utils::get_token(loginUrl, this->rest_user_name_, this->rest_password_, this->securityConfig_);
logger_->log_debug("Token from NiFi REST Api endpoint %s", token);
if (token.empty())
@@ -285,7 +285,7 @@ void RemoteProcessorGroupPort::refreshRemoteSite2SiteInfo() {
logger_->log_info("process group remote site2site port %d, is secure %d", site2site_port_, site2site_secure_);
}
} else {
- logger_->log_error("Cannot output body to content for ProcessGroup::refreshRemoteSite2SiteInfo");
+ logger_->log_error("Cannot output body to content for ProcessGroup::refreshRemoteSite2SiteInfo: received HTTP code %d from %s", http_code, fullUrl);
}
} else {
logger_->log_error(