This is an automated email from the ASF dual-hosted git repository.
martinzink pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
commit 3cf814be29102248093d10898b827fb7fc287655
Author: Marton Szasz <sza...@apache.org>
AuthorDate: Tue May 21 13:42:28 2024 +0200
MINIFICPP-2353 improve some logs, accept the old yaml c2 mimetype
Closes #1772
Signed-off-by: Martin Zink <martinz...@apache.org>
---
extensions/http-curl/tests/C2ClearCoreComponentStateTest.cpp | 4 ++--
extensions/libarchive/MergeContent.cpp | 4 ++--
extensions/libarchive/MergeContent.h | 2 +-
extensions/standard-processors/processors/UpdateAttribute.cpp | 2 +-
libminifi/include/core/flow/AdaptiveConfiguration.h | 2 +-
libminifi/src/controllers/SSLContextService.cpp | 4 ++--
libminifi/src/core/ProcessSession.cpp | 6 +++---
7 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/extensions/http-curl/tests/C2ClearCoreComponentStateTest.cpp
b/extensions/http-curl/tests/C2ClearCoreComponentStateTest.cpp
index f43204c77..48202512a 100644
--- a/extensions/http-curl/tests/C2ClearCoreComponentStateTest.cpp
+++ b/extensions/http-curl/tests/C2ClearCoreComponentStateTest.cpp
@@ -41,7 +41,7 @@ class VerifyC2ClearCoreComponentState : public VerifyC2Base {
LogTestController::getInstance().setDebug<minifi::c2::RESTSender>();
LogTestController::getInstance().setDebug<minifi::FlowController>();
LogTestController::getInstance().setDebug<minifi::core::ProcessContext>();
- LogTestController::getInstance().setTrace<minifi::core::ProcessSession>();
+ LogTestController::getInstance().setDebug<minifi::core::ProcessSession>();
LogTestController::getInstance().setDebug<minifi::processors::TailFile>();
VerifyC2Base::testSetup();
}
@@ -139,7 +139,7 @@ class ClearCoreComponentStateHandler: public
HeartbeatHandler {
auto tail_file_ran_again_checker = [this] {
const auto log_contents = LogTestController::getInstance().getLogs();
const std::string tailing_file_pattern = "[debug] Tailing file " +
file_1_location_.string();
- const std::string tail_file_committed_pattern = "[trace]
ProcessSession committed for TailFile1";
+ const std::string tail_file_committed_pattern = "ProcessSession
committed for TailFile1";
const std::vector<std::string> patterns = {tailing_file_pattern,
tailing_file_pattern, tail_file_committed_pattern};
return utils::string::matchesSequence(log_contents, patterns);
};
diff --git a/extensions/libarchive/MergeContent.cpp
b/extensions/libarchive/MergeContent.cpp
index c24dd5569..45a7c13f9 100644
--- a/extensions/libarchive/MergeContent.cpp
+++ b/extensions/libarchive/MergeContent.cpp
@@ -232,7 +232,7 @@ bool MergeContent::processBin(core::ProcessSession
&session, std::unique_ptr<Bin
return session.read(ff, cb);
};
- const char* mimeType;
+ const char* mimeType = nullptr;
std::unique_ptr<MergeBin> mergeBin;
std::unique_ptr<minifi::FlowFileSerializer> serializer =
std::make_unique<PayloadSerializer>(flowFileReader);
if (mergeFormat_ == merge_content_options::MERGE_FORMAT_CONCAT_VALUE) {
@@ -272,7 +272,7 @@ bool MergeContent::processBin(core::ProcessSession
&session, std::unique_ptr<Bin
for (const auto& flow : flows) {
session.transfer(flow, Original);
}
- logger_->log_info("Merge FlowFile record UUID {}, payload length {}",
merge_flow->getUUIDStr(), merge_flow->getSize());
+ logger_->log_debug("Merge FlowFile record UUID {}, payload length {}",
merge_flow->getUUIDStr(), merge_flow->getSize());
return true;
}
diff --git a/extensions/libarchive/MergeContent.h
b/extensions/libarchive/MergeContent.h
index 895269865..af6f1c9c1 100644
--- a/extensions/libarchive/MergeContent.h
+++ b/extensions/libarchive/MergeContent.h
@@ -381,7 +381,7 @@ class MergeContent : public processors::BinFiles {
ADD_COMMON_VIRTUAL_FUNCTIONS_FOR_PROCESSORS
- void onSchedule(core::ProcessContext& context, core::ProcessSessionFactory&
sessionFactory) override;
+ void onSchedule(core::ProcessContext& context, core::ProcessSessionFactory&
session_factory) override;
void onTrigger(core::ProcessContext& context, core::ProcessSession& session)
override;
void initialize() override;
bool processBin(core::ProcessSession &session, std::unique_ptr<Bin> &bin)
override;
diff --git a/extensions/standard-processors/processors/UpdateAttribute.cpp
b/extensions/standard-processors/processors/UpdateAttribute.cpp
index e7ea701c4..bb443ba07 100644
--- a/extensions/standard-processors/processors/UpdateAttribute.cpp
+++ b/extensions/standard-processors/processors/UpdateAttribute.cpp
@@ -57,7 +57,7 @@ void UpdateAttribute::onTrigger(core::ProcessContext&
context, core::ProcessSess
std::string value;
context.getDynamicProperty(attribute, value, flow_file.get());
flow_file->setAttribute(attribute.getName(), value);
- logger_->log_info("Set attribute '{}' of flow file '{}' with value
'{}'", attribute.getName(), flow_file->getUUIDStr(), value);
+ logger_->log_debug("Set attribute '{}' of flow file '{}' with value
'{}'", attribute.getName(), flow_file->getUUIDStr(), value);
}
session.transfer(flow_file, Success);
} catch (const std::exception &e) {
diff --git a/libminifi/include/core/flow/AdaptiveConfiguration.h
b/libminifi/include/core/flow/AdaptiveConfiguration.h
index fe041ff9c..6487f5ef0 100644
--- a/libminifi/include/core/flow/AdaptiveConfiguration.h
+++ b/libminifi/include/core/flow/AdaptiveConfiguration.h
@@ -30,7 +30,7 @@ class AdaptiveConfiguration : public StructuredConfiguration {
explicit AdaptiveConfiguration(ConfigurationContext ctx);
std::vector<std::string> getSupportedFormats() const override {
- return {"application/json", "text/yml"};
+ return {"application/json", "text/yml",
"application/vnd.minifi-c2+yaml;version=2"};
}
std::unique_ptr<core::ProcessGroup> getRootFromPayload(const std::string
&payload) override;
diff --git a/libminifi/src/controllers/SSLContextService.cpp
b/libminifi/src/controllers/SSLContextService.cpp
index 718078c51..d2e194c27 100644
--- a/libminifi/src/controllers/SSLContextService.cpp
+++ b/libminifi/src/controllers/SSLContextService.cpp
@@ -523,9 +523,9 @@ void SSLContextService::verifyCertificateExpiration() {
if (end_date.value() < std::chrono::system_clock::now()) {
logger_->log_error("Certificate in '{}' expired at {}", cert_file,
end_date_str);
} else if (auto diff = end_date.value() -
std::chrono::system_clock::now(); diff < std::chrono::weeks{2}) {
- logger_->log_error("Certificate in '{}' will expire at {}", cert_file,
end_date_str);
+ logger_->log_warn("Certificate in '{}' will expire at {}", cert_file,
end_date_str);
} else {
- logger_->log_error("Certificate in '{}' will expire at {}", cert_file,
end_date_str);
+ logger_->log_debug("Certificate in '{}' will expire at {}", cert_file,
end_date_str);
}
} else {
logger_->log_error("Could not determine expiration date for certificate
in '{}'", cert_file);
diff --git a/libminifi/src/core/ProcessSession.cpp
b/libminifi/src/core/ProcessSession.cpp
index c8d28a263..5a2460ec8 100644
--- a/libminifi/src/core/ProcessSession.cpp
+++ b/libminifi/src/core/ProcessSession.cpp
@@ -194,7 +194,7 @@ std::shared_ptr<core::FlowFile> ProcessSession::clone(const
FlowFile& parent, in
}
void ProcessSession::remove(const std::shared_ptr<core::FlowFile> &flow) {
- logger_->log_trace("Removing flow file with UUID: {}", flow->getUUIDStr());
+ logger_->log_debug("Removing flow file with UUID: {}", flow->getUUIDStr());
flow->setDeleted(true);
deleted_flowfiles_.push_back(flow);
std::string reason = process_context_->getProcessorNode()->getName() + "
drop flow record " + flow->getUUIDStr();
@@ -220,7 +220,7 @@ void ProcessSession::penalize(const
std::shared_ptr<core::FlowFile> &flow) {
}
void ProcessSession::transfer(const std::shared_ptr<core::FlowFile>& flow,
const Relationship& relationship) {
- logger_->log_info("Transferring {} from {} to relationship {}",
flow->getUUIDStr(), process_context_->getProcessorNode()->getName(),
relationship.getName());
+ logger_->log_debug("Transferring {} from {} to relationship {}",
flow->getUUIDStr(), process_context_->getProcessorNode()->getName(),
relationship.getName());
utils::Identifier uuid = flow->getUUID();
if (auto it = added_flowfiles_.find(uuid); it != added_flowfiles_.end()) {
it->second.rel = &*relationships_.insert(relationship).first;
@@ -915,7 +915,7 @@ void ProcessSession::commit() {
relationships_.clear();
// persistent the provenance report
this->provenance_report_->commit();
- logger_->log_trace("ProcessSession committed for {}",
process_context_->getProcessorNode()->getName());
+ logger_->log_debug("ProcessSession committed for {}",
process_context_->getProcessorNode()->getName());
} catch (const std::exception& exception) {
logger_->log_debug("Caught Exception during process session commit, type:
{}, what: {}", typeid(exception).name(), exception.what());
throw;
