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:38 UTC
[2/5] nifi-minifi-cpp git commit: removed log warnings and errors
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;