You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by je...@apache.org on 2016/12/31 22:38:37 UTC
[1/5] nifi-minifi-cpp git commit: receive flow files
Repository: nifi-minifi-cpp
Updated Branches:
refs/heads/master ee4bb1353 -> ee39673c4
receive flow files
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/14ad33eb
Tree: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/tree/14ad33eb
Diff: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/diff/14ad33eb
Branch: refs/heads/master
Commit: 14ad33eb196a5a596bc77cfa389df2b3244881b6
Parents: 19b74bf
Author: Kathik Narayanan <kn...@hortonworks.com>
Authored: Mon Dec 19 14:18:20 2016 -0500
Committer: Kathik Narayanan <kn...@hortonworks.com>
Committed: Mon Dec 19 14:18:20 2016 -0500
----------------------------------------------------------------------
libminifi/src/FlowControlProtocol.cpp | 2 ++
libminifi/src/FlowController.cpp | 21 ++++++++++++++++-----
libminifi/src/RemoteProcessorGroupPort.cpp | 1 +
main/MiNiFiMain.cpp | 2 +-
4 files changed, 20 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/blob/14ad33eb/libminifi/src/FlowControlProtocol.cpp
----------------------------------------------------------------------
diff --git a/libminifi/src/FlowControlProtocol.cpp b/libminifi/src/FlowControlProtocol.cpp
index 011ebcf..3a041c7 100644
--- a/libminifi/src/FlowControlProtocol.cpp
+++ b/libminifi/src/FlowControlProtocol.cpp
@@ -252,6 +252,7 @@ void FlowControlProtocol::run(FlowControlProtocol *protocol)
int FlowControlProtocol::sendRegisterReq()
{
+ _logger->log_info("registering");
if (_registered)
{
_logger->log_info("Already registered");
@@ -261,6 +262,7 @@ int FlowControlProtocol::sendRegisterReq()
uint16_t port = this->_serverPort;
if (this->_socket <= 0)
+ _logger->log_info("connecting to nifi %s %s",_serverName.c_str(), port);
this->_socket = connectServer(_serverName.c_str(), port);
if (this->_socket <= 0)
http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/blob/14ad33eb/libminifi/src/FlowController.cpp
----------------------------------------------------------------------
diff --git a/libminifi/src/FlowController.cpp b/libminifi/src/FlowController.cpp
index 3598716..cac33d8 100644
--- a/libminifi/src/FlowController.cpp
+++ b/libminifi/src/FlowController.cpp
@@ -562,6 +562,7 @@ void FlowController::parseRemoteProcessGroupYaml(YAML::Node *rpgNode, ProcessGro
_logger->log_debug("parseRemoteProcessGroupYaml: yield period => [%s]", yieldPeriod.c_str());
YAML::Node inputPorts = rpgNode["Input Ports"].as<YAML::Node>();
+ YAML::Node outputPorts = rpgNode["Output Ports"].as<YAML::Node>();
ProcessGroup *group = NULL;
// generate the random UUID
@@ -603,6 +604,16 @@ void FlowController::parseRemoteProcessGroupYaml(YAML::Node *rpgNode, ProcessGro
this->parsePortYaml(&currPort, group, SEND);
} // for node
}
+ if (outputPorts.IsSequence()) {
+ for (YAML::const_iterator portIter = outputPorts.begin(); portIter != outputPorts.end(); ++portIter) {
+ _logger->log_debug("Got a current port, iterating...");
+
+ YAML::Node currPort = portIter->as<YAML::Node>();
+
+ this->parsePortYaml(&currPort, group, RECEIVE);
+ } // for node
+ }
+
}
}
}
@@ -799,13 +810,13 @@ void FlowController::parsePortYaml(YAML::Node *portNode, ProcessGroup *parent, T
return;
}
- YAML::Node inputPortsObj = portNode->as<YAML::Node>();
+ YAML::Node portsObj = portNode->as<YAML::Node>();
// generate the random UIID
uuid_generate(uuid);
- auto portId = inputPortsObj["id"].as<std::string>();
- auto nameStr = inputPortsObj["name"].as<std::string>();
+ auto portId = portsObj["id"].as<std::string>();
+ auto nameStr = portsObj["name"].as<std::string>();
uuid_parse(portId.c_str(), uuid);
port = new RemoteProcessorGroupPort(nameStr.c_str(), uuid);
@@ -826,7 +837,7 @@ void FlowController::parsePortYaml(YAML::Node *portNode, ProcessGroup *parent, T
// add processor to parent
parent->addProcessor(processor);
processor->setScheduledState(RUNNING);
- auto rawMaxConcurrentTasks = inputPortsObj["max concurrent tasks"].as<std::string>();
+ auto rawMaxConcurrentTasks = portsObj["max concurrent tasks"].as<std::string>();
int64_t maxConcurrentTasks;
if (Property::StringToInt(rawMaxConcurrentTasks, maxConcurrentTasks)) {
processor->setMaxConcurrentTasks(maxConcurrentTasks);
@@ -1164,7 +1175,7 @@ void FlowController::load(ConfigFormat configFormat) {
parseProcessorNodeYaml(processorsNode, this->_root);
parseRemoteProcessGroupYaml(&remoteProcessingGroupNode, this->_root);
parseConnectionYaml(&connectionsNode, this->_root);
-
+ _logger->log_error("finished loading the yaml");
_initialized = true;
}
}
http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/blob/14ad33eb/libminifi/src/RemoteProcessorGroupPort.cpp
----------------------------------------------------------------------
diff --git a/libminifi/src/RemoteProcessorGroupPort.cpp b/libminifi/src/RemoteProcessorGroupPort.cpp
index 9d849ae..c9a89f3 100644
--- a/libminifi/src/RemoteProcessorGroupPort.cpp
+++ b/libminifi/src/RemoteProcessorGroupPort.cpp
@@ -52,6 +52,7 @@ void RemoteProcessorGroupPort::initialize()
void RemoteProcessorGroupPort::onTrigger(ProcessContext *context, ProcessSession *session)
{
+ _logger->log_error("Remote Process Group Triggered");
std::string value;
if (!_transmitting)
http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/blob/14ad33eb/main/MiNiFiMain.cpp
----------------------------------------------------------------------
diff --git a/main/MiNiFiMain.cpp b/main/MiNiFiMain.cpp
index 11e8f00..ace58f3 100644
--- a/main/MiNiFiMain.cpp
+++ b/main/MiNiFiMain.cpp
@@ -66,7 +66,7 @@ void sigHandler(int signal)
int main(int argc, char **argv)
{
Logger *logger = Logger::getLogger();
- logger->setLogLevel(info);
+ logger->setLogLevel(trace);
// assumes POSIX compliant environment
std::string minifiHome;
[4/5] nifi-minifi-cpp git commit: Merge remote-tracking branch
'apache/master'
Posted by je...@apache.org.
Merge remote-tracking branch 'apache/master'
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/47055a1d
Tree: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/tree/47055a1d
Diff: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/diff/47055a1d
Branch: refs/heads/master
Commit: 47055a1dd4874f63f73425d765c195f52c16c542
Parents: d07e00f 6286872
Author: Jeremy Dyer <jd...@gmail.com>
Authored: Tue Dec 27 11:41:52 2016 -0500
Committer: Jeremy Dyer <jd...@gmail.com>
Committed: Tue Dec 27 11:41:52 2016 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[3/5] nifi-minifi-cpp git commit: Merge branch 'master' of
https://github.com/apache/nifi-minifi-cpp
Posted by je...@apache.org.
Merge branch 'master' of https://github.com/apache/nifi-minifi-cpp
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/d07e00f9
Tree: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/tree/d07e00f9
Diff: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/diff/d07e00f9
Branch: refs/heads/master
Commit: d07e00f94fb08a0ddeb8a498e23d5017d3daa07b
Parents: b2a514d e9cfbfe
Author: Kathik Narayanan <kn...@hortonworks.com>
Authored: Tue Dec 20 23:52:26 2016 -0500
Committer: Kathik Narayanan <kn...@hortonworks.com>
Committed: Tue Dec 20 23:52:26 2016 -0500
----------------------------------------------------------------------
libminifi/include/AppendHostInfo.h | 67 ++++++++++++++++++++++
libminifi/include/FlowController.h | 1 +
libminifi/src/AppendHostInfo.cpp | 99 +++++++++++++++++++++++++++++++++
libminifi/src/FlowController.cpp | 4 ++
4 files changed, 171 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/blob/d07e00f9/libminifi/src/FlowController.cpp
----------------------------------------------------------------------
[5/5] nifi-minifi-cpp git commit: Merge remote-tracking branch
'apache-github/master'
Posted by je...@apache.org.
Merge remote-tracking branch 'apache-github/master'
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/ee39673c
Tree: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/tree/ee39673c
Diff: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/diff/ee39673c
Branch: refs/heads/master
Commit: ee39673c46e841dbddd2e3c4598f7c72d02461a1
Parents: 47055a1 ee4bb13
Author: Jeremy Dyer <jd...@gmail.com>
Authored: Sat Dec 31 17:16:07 2016 -0500
Committer: Jeremy Dyer <jd...@gmail.com>
Committed: Sat Dec 31 17:16:07 2016 -0500
----------------------------------------------------------------------
examples/BidirectionalSiteToSite/README.md | 108 ++++++++++++
.../assets/Apache_NiFi_Incoming_Data.png | Bin 0 -> 96992 bytes
.../assets/Apache_NiFi_Outgoing_Data.png | Bin 0 -> 97630 bytes
.../assets/Apache_NiFi_Workflow.png | Bin 0 -> 97556 bytes
.../assets/BidirectionalSite2SiteExample.xml | 169 +++++++++++++++++++
.../assets/BidirectionalSiteToSite.png | Bin 0 -> 81229 bytes
examples/README.md | 17 ++
7 files changed, 294 insertions(+)
----------------------------------------------------------------------
[2/5] nifi-minifi-cpp git commit: removed log warnings and errors
Posted by je...@apache.org.
removed log warnings and errors
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/b2a514d1
Tree: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/tree/b2a514d1
Diff: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/diff/b2a514d1
Branch: refs/heads/master
Commit: b2a514d1d075a97c0aeee98a4d8df9479ffb273c
Parents: 14ad33e
Author: Kathik Narayanan <kn...@hortonworks.com>
Authored: Tue Dec 20 23:39:33 2016 -0500
Committer: Kathik Narayanan <kn...@hortonworks.com>
Committed: Tue Dec 20 23:39:33 2016 -0500
----------------------------------------------------------------------
libminifi/src/FlowControlProtocol.cpp | 2 --
libminifi/src/FlowController.cpp | 16 ++++++++--------
libminifi/src/RemoteProcessorGroupPort.cpp | 1 -
main/MiNiFiMain.cpp | 2 +-
4 files changed, 9 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/blob/b2a514d1/libminifi/src/FlowControlProtocol.cpp
----------------------------------------------------------------------
diff --git a/libminifi/src/FlowControlProtocol.cpp b/libminifi/src/FlowControlProtocol.cpp
index 3a041c7..011ebcf 100644
--- a/libminifi/src/FlowControlProtocol.cpp
+++ b/libminifi/src/FlowControlProtocol.cpp
@@ -252,7 +252,6 @@ void FlowControlProtocol::run(FlowControlProtocol *protocol)
int FlowControlProtocol::sendRegisterReq()
{
- _logger->log_info("registering");
if (_registered)
{
_logger->log_info("Already registered");
@@ -262,7 +261,6 @@ int FlowControlProtocol::sendRegisterReq()
uint16_t port = this->_serverPort;
if (this->_socket <= 0)
- _logger->log_info("connecting to nifi %s %s",_serverName.c_str(), port);
this->_socket = connectServer(_serverName.c_str(), port);
if (this->_socket <= 0)
http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/blob/b2a514d1/libminifi/src/FlowController.cpp
----------------------------------------------------------------------
diff --git a/libminifi/src/FlowController.cpp b/libminifi/src/FlowController.cpp
index cac33d8..e99acc5 100644
--- a/libminifi/src/FlowController.cpp
+++ b/libminifi/src/FlowController.cpp
@@ -562,7 +562,7 @@ void FlowController::parseRemoteProcessGroupYaml(YAML::Node *rpgNode, ProcessGro
_logger->log_debug("parseRemoteProcessGroupYaml: yield period => [%s]", yieldPeriod.c_str());
YAML::Node inputPorts = rpgNode["Input Ports"].as<YAML::Node>();
- YAML::Node outputPorts = rpgNode["Output Ports"].as<YAML::Node>();
+ YAML::Node outputPorts = rpgNode["Output Ports"].as<YAML::Node>();
ProcessGroup *group = NULL;
// generate the random UUID
@@ -595,7 +595,7 @@ void FlowController::parseRemoteProcessGroupYaml(YAML::Node *rpgNode, ProcessGro
group->setTransmitting(true);
group->setURL(url);
- if (inputPorts.IsSequence()) {
+ if (inputPorts && inputPorts.IsSequence()) {
for (YAML::const_iterator portIter = inputPorts.begin(); portIter != inputPorts.end(); ++portIter) {
_logger->log_debug("Got a current port, iterating...");
@@ -604,7 +604,7 @@ void FlowController::parseRemoteProcessGroupYaml(YAML::Node *rpgNode, ProcessGro
this->parsePortYaml(&currPort, group, SEND);
} // for node
}
- if (outputPorts.IsSequence()) {
+ if (outputPorts && outputPorts.IsSequence()) {
for (YAML::const_iterator portIter = outputPorts.begin(); portIter != outputPorts.end(); ++portIter) {
_logger->log_debug("Got a current port, iterating...");
@@ -810,13 +810,13 @@ void FlowController::parsePortYaml(YAML::Node *portNode, ProcessGroup *parent, T
return;
}
- YAML::Node portsObj = portNode->as<YAML::Node>();
+ YAML::Node inputPortsObj = portNode->as<YAML::Node>();
// generate the random UIID
uuid_generate(uuid);
- auto portId = portsObj["id"].as<std::string>();
- auto nameStr = portsObj["name"].as<std::string>();
+ auto portId = inputPortsObj["id"].as<std::string>();
+ auto nameStr = inputPortsObj["name"].as<std::string>();
uuid_parse(portId.c_str(), uuid);
port = new RemoteProcessorGroupPort(nameStr.c_str(), uuid);
@@ -837,7 +837,7 @@ void FlowController::parsePortYaml(YAML::Node *portNode, ProcessGroup *parent, T
// add processor to parent
parent->addProcessor(processor);
processor->setScheduledState(RUNNING);
- auto rawMaxConcurrentTasks = portsObj["max concurrent tasks"].as<std::string>();
+ auto rawMaxConcurrentTasks = inputPortsObj["max concurrent tasks"].as<std::string>();
int64_t maxConcurrentTasks;
if (Property::StringToInt(rawMaxConcurrentTasks, maxConcurrentTasks)) {
processor->setMaxConcurrentTasks(maxConcurrentTasks);
@@ -1175,7 +1175,7 @@ void FlowController::load(ConfigFormat configFormat) {
parseProcessorNodeYaml(processorsNode, this->_root);
parseRemoteProcessGroupYaml(&remoteProcessingGroupNode, this->_root);
parseConnectionYaml(&connectionsNode, this->_root);
- _logger->log_error("finished loading the yaml");
+
_initialized = true;
}
}
http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/blob/b2a514d1/libminifi/src/RemoteProcessorGroupPort.cpp
----------------------------------------------------------------------
diff --git a/libminifi/src/RemoteProcessorGroupPort.cpp b/libminifi/src/RemoteProcessorGroupPort.cpp
index c9a89f3..9d849ae 100644
--- a/libminifi/src/RemoteProcessorGroupPort.cpp
+++ b/libminifi/src/RemoteProcessorGroupPort.cpp
@@ -52,7 +52,6 @@ void RemoteProcessorGroupPort::initialize()
void RemoteProcessorGroupPort::onTrigger(ProcessContext *context, ProcessSession *session)
{
- _logger->log_error("Remote Process Group Triggered");
std::string value;
if (!_transmitting)
http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/blob/b2a514d1/main/MiNiFiMain.cpp
----------------------------------------------------------------------
diff --git a/main/MiNiFiMain.cpp b/main/MiNiFiMain.cpp
index ace58f3..11e8f00 100644
--- a/main/MiNiFiMain.cpp
+++ b/main/MiNiFiMain.cpp
@@ -66,7 +66,7 @@ void sigHandler(int signal)
int main(int argc, char **argv)
{
Logger *logger = Logger::getLogger();
- logger->setLogLevel(trace);
+ logger->setLogLevel(info);
// assumes POSIX compliant environment
std::string minifiHome;