This is an automated email from the ASF dual-hosted git repository. martinzink pushed a commit to branch minifi-api-property in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
commit b08ea19f3a40f49e041ea5d96c8b8115abdea7ee Author: Martin Zink <[email protected]> AuthorDate: Wed Mar 12 13:03:16 2025 +0100 renamed from parse[Optional]MsProperty to parse[Optional]DurationProperty --- extension-utils/include/utils/ProcessorConfigUtils.h | 4 ++-- extension-utils/src/utils/ProcessorConfigUtils.cpp | 4 ++-- extensions/aws/processors/ListS3.cpp | 2 +- extensions/aws/processors/PutS3Object.cpp | 4 ++-- extensions/aws/processors/S3Processor.cpp | 2 +- extensions/execute-process/ExecuteProcess.cpp | 2 +- extensions/grafana-loki/PushGrafanaLoki.cpp | 2 +- extensions/grafana-loki/PushGrafanaLokiGrpc.cpp | 6 +++--- extensions/grafana-loki/PushGrafanaLokiREST.cpp | 4 ++-- extensions/kafka/ConsumeKafka.cpp | 4 ++-- extensions/kafka/PublishKafka.cpp | 6 +++--- extensions/libarchive/BinFiles.cpp | 2 +- extensions/mqtt/processors/AbstractMQTTProcessor.cpp | 4 ++-- extensions/mqtt/processors/ConsumeMQTT.cpp | 2 +- extensions/mqtt/processors/PublishMQTT.cpp | 2 +- extensions/sftp/processors/ListSFTP.cpp | 4 ++-- extensions/sftp/processors/SFTPProcessorBase.cpp | 4 ++-- extensions/smb/ListSmb.cpp | 4 ++-- extensions/splunk/QuerySplunkIndexingStatus.cpp | 2 +- extensions/standard-processors/modbus/FetchModbusTcp.cpp | 4 ++-- extensions/standard-processors/processors/GetFile.cpp | 6 +++--- extensions/standard-processors/processors/GetTCP.cpp | 4 ++-- extensions/standard-processors/processors/InvokeHTTP.cpp | 4 ++-- extensions/standard-processors/processors/ListFile.cpp | 4 ++-- extensions/standard-processors/processors/PutTCP.cpp | 4 ++-- extensions/standard-processors/processors/TailFile.cpp | 2 +- 26 files changed, 46 insertions(+), 46 deletions(-) diff --git a/extension-utils/include/utils/ProcessorConfigUtils.h b/extension-utils/include/utils/ProcessorConfigUtils.h index abbf56f7d..d25ff270b 100644 --- a/extension-utils/include/utils/ProcessorConfigUtils.h +++ b/extension-utils/include/utils/ProcessorConfigUtils.h @@ -40,8 +40,8 @@ uint64_t parseU64Property(const core::ProcessContext& ctx, const core::PropertyR std::optional<int64_t> parseOptionalI64Property(const core::ProcessContext& ctx, const core::PropertyReference& property, const core::FlowFile* flow_file = nullptr); int64_t parseI64Property(const core::ProcessContext& ctx, const core::PropertyReference& property, const core::FlowFile* flow_file = nullptr); -std::optional<std::chrono::milliseconds> parseOptionalMsProperty(const core::ProcessContext& ctx, const core::PropertyReference& property, const core::FlowFile* flow_file = nullptr); -std::chrono::milliseconds parseMsProperty(const core::ProcessContext& ctx, const core::PropertyReference& property, const core::FlowFile* flow_file = nullptr); +std::optional<std::chrono::milliseconds> parseOptionalDurationProperty(const core::ProcessContext& ctx, const core::PropertyReference& property, const core::FlowFile* flow_file = nullptr); +std::chrono::milliseconds parseDurationProperty(const core::ProcessContext& ctx, const core::PropertyReference& property, const core::FlowFile* flow_file = nullptr); std::optional<uint64_t> parseOptionalDataSizeProperty(const core::ProcessContext& ctx, const core::PropertyReference& property, const core::FlowFile* flow_file = nullptr); uint64_t parseDataSizeProperty(const core::ProcessContext& ctx, const core::PropertyReference& property, const core::FlowFile* flow_file = nullptr); diff --git a/extension-utils/src/utils/ProcessorConfigUtils.cpp b/extension-utils/src/utils/ProcessorConfigUtils.cpp index 3bcf93e5c..fc0125e97 100644 --- a/extension-utils/src/utils/ProcessorConfigUtils.cpp +++ b/extension-utils/src/utils/ProcessorConfigUtils.cpp @@ -71,7 +71,7 @@ int64_t parseI64Property(const core::ProcessContext& ctx, const core::PropertyRe return ctx.getProperty(property, flow_file) | utils::andThen(parsing::parseIntegral<int64_t>) | utils::expect(fmt::format("Expected parsable int64_t from {}::{}", ctx.getProcessor().getName(), property.name)); } -std::optional<std::chrono::milliseconds> parseOptionalMsProperty(const core::ProcessContext& ctx, const core::PropertyReference& property, const core::FlowFile* flow_file) { +std::optional<std::chrono::milliseconds> parseOptionalDurationProperty(const core::ProcessContext& ctx, const core::PropertyReference& property, const core::FlowFile* flow_file) { if (const auto property_str = ctx.getProperty(property, flow_file)) { if (property_str->empty()) { return std::nullopt; @@ -82,7 +82,7 @@ std::optional<std::chrono::milliseconds> parseOptionalMsProperty(const core::Pro return std::nullopt; } -std::chrono::milliseconds parseMsProperty(const core::ProcessContext& ctx, const core::PropertyReference& property, const core::FlowFile* flow_file) { +std::chrono::milliseconds parseDurationProperty(const core::ProcessContext& ctx, const core::PropertyReference& property, const core::FlowFile* flow_file) { return ctx.getProperty(property, flow_file) | utils::andThen(parsing::parseDuration<std::chrono::milliseconds>) | utils::expect(fmt::format("Expected parsable duration from {}::{}", ctx.getProcessor().getName(), property.name)); } diff --git a/extensions/aws/processors/ListS3.cpp b/extensions/aws/processors/ListS3.cpp index 2ad5ad3a7..a3a482ae4 100644 --- a/extensions/aws/processors/ListS3.cpp +++ b/extensions/aws/processors/ListS3.cpp @@ -65,7 +65,7 @@ void ListS3::onSchedule(core::ProcessContext& context, core::ProcessSessionFacto list_request_params_->use_versions = minifi::utils::parseBoolProperty(context, UseVersions); logger_->log_debug("ListS3: UseVersions [{}]", list_request_params_->use_versions); - list_request_params_->min_object_age = minifi::utils::parseMsProperty(context, MinimumObjectAge).count(); + list_request_params_->min_object_age = minifi::utils::parseDurationProperty(context, MinimumObjectAge).count(); logger_->log_debug("S3Processor: Minimum Object Age [{}]", list_request_params_->min_object_age); write_object_tags_ = minifi::utils::parseBoolProperty(context, WriteObjectTags); diff --git a/extensions/aws/processors/PutS3Object.cpp b/extensions/aws/processors/PutS3Object.cpp index 2e9413c95..8fda0504a 100644 --- a/extensions/aws/processors/PutS3Object.cpp +++ b/extensions/aws/processors/PutS3Object.cpp @@ -82,10 +82,10 @@ void PutS3Object::onSchedule(core::ProcessContext& context, core::ProcessSession logger_->log_debug("PutS3Object: Multipart Size {}", multipart_size_); - multipart_upload_ageoff_interval_ = minifi::utils::parseMsProperty(context, MultipartUploadAgeOffInterval); + multipart_upload_ageoff_interval_ = minifi::utils::parseDurationProperty(context, MultipartUploadAgeOffInterval); logger_->log_debug("PutS3Object: Multipart Upload Ageoff Interval {}", multipart_upload_ageoff_interval_); - multipart_upload_max_age_threshold_ = minifi::utils::parseMsProperty(context, MultipartUploadMaxAgeThreshold); + multipart_upload_max_age_threshold_ = minifi::utils::parseDurationProperty(context, MultipartUploadMaxAgeThreshold); logger_->log_debug("PutS3Object: Multipart Upload Max Age Threshold {}", multipart_upload_max_age_threshold_); fillUserMetadata(context); diff --git a/extensions/aws/processors/S3Processor.cpp b/extensions/aws/processors/S3Processor.cpp index ff76a548a..70467d9e9 100644 --- a/extensions/aws/processors/S3Processor.cpp +++ b/extensions/aws/processors/S3Processor.cpp @@ -101,7 +101,7 @@ void S3Processor::onSchedule(core::ProcessContext& context, core::ProcessSession client_config_->region = context.getProperty(Region) | minifi::utils::expect("Region property missing or invalid"); logger_->log_debug("S3Processor: Region [{}]", client_config_->region); - if (auto communications_timeout = minifi::utils::parseOptionalMsProperty(context, CommunicationsTimeout)) { + if (auto communications_timeout = minifi::utils::parseOptionalDurationProperty(context, CommunicationsTimeout)) { logger_->log_debug("S3Processor: Communications Timeout {}", *communications_timeout); client_config_->connectTimeoutMs = gsl::narrow<long>(communications_timeout->count()); // NOLINT(runtime/int,google-runtime-int) } else { diff --git a/extensions/execute-process/ExecuteProcess.cpp b/extensions/execute-process/ExecuteProcess.cpp index 060e1a15f..4963e2ec0 100644 --- a/extensions/execute-process/ExecuteProcess.cpp +++ b/extensions/execute-process/ExecuteProcess.cpp @@ -54,7 +54,7 @@ void ExecuteProcess::onSchedule(core::ProcessContext& context, core::ProcessSess if (auto working_dir_str = context.getProperty(WorkingDir)) { working_dir_ = *working_dir_str; } - batch_duration_ = utils::parseMsProperty(context, BatchDuration); + batch_duration_ = utils::parseDurationProperty(context, BatchDuration); logger_->log_debug("Setting batch duration to {}", batch_duration_); if (const auto redirect_error_stream = utils::parseOptionalBoolProperty(context, RedirectErrorStream)) { diff --git a/extensions/grafana-loki/PushGrafanaLoki.cpp b/extensions/grafana-loki/PushGrafanaLoki.cpp index 15ba811c5..d37bff95c 100644 --- a/extensions/grafana-loki/PushGrafanaLoki.cpp +++ b/extensions/grafana-loki/PushGrafanaLoki.cpp @@ -130,7 +130,7 @@ void PushGrafanaLoki::onSchedule(core::ProcessContext& context, core::ProcessSes log_line_metadata_attributes_ = utils::string::splitAndTrimRemovingEmpty(*log_line_metadata_attributes, ","); } - auto log_line_batch_wait = utils::parseOptionalMsProperty(context, LogLineBatchWait); + auto log_line_batch_wait = utils::parseOptionalDurationProperty(context, LogLineBatchWait); auto log_line_batch_size = utils::parseOptionalU64Property(context, LogLineBatchSize); if (log_line_batch_size && *log_line_batch_size < 1) { throw Exception(PROCESS_SCHEDULE_EXCEPTION, "Log Line Batch Size property is missing or less than 1!"); diff --git a/extensions/grafana-loki/PushGrafanaLokiGrpc.cpp b/extensions/grafana-loki/PushGrafanaLokiGrpc.cpp index 1200f7db2..d13634ce8 100644 --- a/extensions/grafana-loki/PushGrafanaLokiGrpc.cpp +++ b/extensions/grafana-loki/PushGrafanaLokiGrpc.cpp @@ -56,12 +56,12 @@ void PushGrafanaLokiGrpc::setUpStreamLabels(core::ProcessContext& context) { void PushGrafanaLokiGrpc::setUpGrpcChannel(const std::string& url, core::ProcessContext& context) { ::grpc::ChannelArguments args; - if (auto keep_alive_time = utils::parseOptionalMsProperty(context, PushGrafanaLokiGrpc::KeepAliveTime)) { + if (auto keep_alive_time = utils::parseOptionalDurationProperty(context, PushGrafanaLokiGrpc::KeepAliveTime)) { logger_->log_debug("PushGrafanaLokiGrpc Keep Alive Time is set to {} ms", keep_alive_time->count()); args.SetInt(GRPC_ARG_KEEPALIVE_TIME_MS, gsl::narrow<int>(keep_alive_time->count())); } - if (auto keep_alive_timeout = utils::parseOptionalMsProperty(context, PushGrafanaLokiGrpc::KeepAliveTimeout)) { + if (auto keep_alive_timeout = utils::parseOptionalDurationProperty(context, PushGrafanaLokiGrpc::KeepAliveTimeout)) { logger_->log_debug("PushGrafanaLokiGrpc Keep Alive Timeout is set to {} ms", keep_alive_timeout->count()); args.SetInt(GRPC_ARG_KEEPALIVE_TIMEOUT_MS, gsl::narrow<int>(keep_alive_timeout->count())); } @@ -99,7 +99,7 @@ void PushGrafanaLokiGrpc::onSchedule(core::ProcessContext& context, core::Proces throw Exception(PROCESS_SCHEDULE_EXCEPTION, "Url property cannot be empty!"); } tenant_id_ = context.getProperty(TenantID) | utils::toOptional(); - if (auto connection_timeout = utils::parseOptionalMsProperty(context, PushGrafanaLokiGrpc::ConnectTimeout)) { + if (auto connection_timeout = utils::parseOptionalDurationProperty(context, PushGrafanaLokiGrpc::ConnectTimeout)) { connection_timeout_ms_ = *connection_timeout; } else { throw Exception(PROCESS_SCHEDULE_EXCEPTION, "Invalid connection timeout is set."); diff --git a/extensions/grafana-loki/PushGrafanaLokiREST.cpp b/extensions/grafana-loki/PushGrafanaLokiREST.cpp index d8cd25ee1..74560af5e 100644 --- a/extensions/grafana-loki/PushGrafanaLokiREST.cpp +++ b/extensions/grafana-loki/PushGrafanaLokiREST.cpp @@ -35,11 +35,11 @@ void PushGrafanaLokiREST::initialize() { } void PushGrafanaLokiREST::setupClientTimeouts(const core::ProcessContext& context) { - if (auto connection_timeout = utils::parseOptionalMsProperty(context, PushGrafanaLokiREST::ConnectTimeout)) { + if (auto connection_timeout = utils::parseOptionalDurationProperty(context, PushGrafanaLokiREST::ConnectTimeout)) { client_.setConnectionTimeout(*connection_timeout); } - if (auto read_timeout = utils::parseOptionalMsProperty(context, PushGrafanaLokiREST::ReadTimeout)) { + if (auto read_timeout = utils::parseOptionalDurationProperty(context, PushGrafanaLokiREST::ReadTimeout)) { client_.setReadTimeout(*read_timeout); } } diff --git a/extensions/kafka/ConsumeKafka.cpp b/extensions/kafka/ConsumeKafka.cpp index 72e559a3d..6cd444f78 100644 --- a/extensions/kafka/ConsumeKafka.cpp +++ b/extensions/kafka/ConsumeKafka.cpp @@ -54,8 +54,8 @@ void ConsumeKafka::onSchedule(core::ProcessContext& context, core::ProcessSessio group_id_ = utils::parseProperty(context, GroupID); offset_reset_ = utils::parseProperty(context, OffsetReset); key_attribute_encoding_ = utils::parseProperty(context, KeyAttributeEncoding); - max_poll_time_milliseconds_ = utils::parseMsProperty(context, MaxPollTime); - session_timeout_milliseconds_ = utils::parseMsProperty(context, SessionTimeout); + max_poll_time_milliseconds_ = utils::parseDurationProperty(context, MaxPollTime); + session_timeout_milliseconds_ = utils::parseDurationProperty(context, SessionTimeout); // Optional properties message_demarcator_ = context.getProperty(MessageDemarcator).value_or(""); diff --git a/extensions/kafka/PublishKafka.cpp b/extensions/kafka/PublishKafka.cpp index 5fceaf13c..f0feb6984 100644 --- a/extensions/kafka/PublishKafka.cpp +++ b/extensions/kafka/PublishKafka.cpp @@ -455,7 +455,7 @@ bool PublishKafka::configureNewConnection(core::ProcessContext& context) { } } - if (const auto queue_buffer_max_time = utils::parseOptionalMsProperty(context, QueueBufferMaxTime)) { + if (const auto queue_buffer_max_time = utils::parseOptionalDurationProperty(context, QueueBufferMaxTime)) { auto valueConf = std::to_string(queue_buffer_max_time->count()); result = rd_kafka_conf_set(conf_.get(), "queue.buffering.max.ms", valueConf.c_str(), err_chars.data(), err_chars.size()); logger_->log_debug("PublishKafka: queue.buffering.max.ms [{}]", valueConf); @@ -560,7 +560,7 @@ bool PublishKafka::createNewTopic(core::ProcessContext& context, const std::stri } } - if (const auto request_timeout = utils::parseOptionalMsProperty(context, RequestTimeOut)) { + if (const auto request_timeout = utils::parseOptionalDurationProperty(context, RequestTimeOut)) { auto valueConf = std::to_string(request_timeout->count()); result = rd_kafka_topic_conf_set(topic_conf_.get(), "request.timeout.ms", valueConf.c_str(), err_chars.data(), err_chars.size()); logger_->log_debug("PublishKafka: request.timeout.ms [{}]", valueConf); @@ -570,7 +570,7 @@ bool PublishKafka::createNewTopic(core::ProcessContext& context, const std::stri } } - if (const auto message_timeout = utils::parseOptionalMsProperty(context, MessageTimeOut)) { + if (const auto message_timeout = utils::parseOptionalDurationProperty(context, MessageTimeOut)) { auto valueConf = std::to_string(message_timeout->count()); result = rd_kafka_topic_conf_set(topic_conf_.get(), "message.timeout.ms", valueConf.c_str(), err_chars.data(), err_chars.size()); logger_->log_debug("PublishKafka: message.timeout.ms [{}]", valueConf); diff --git a/extensions/libarchive/BinFiles.cpp b/extensions/libarchive/BinFiles.cpp index 7c3c04433..be12f3591 100644 --- a/extensions/libarchive/BinFiles.cpp +++ b/extensions/libarchive/BinFiles.cpp @@ -70,7 +70,7 @@ void BinFiles::onSchedule(core::ProcessContext& context, core::ProcessSessionFac maxBinCount_ = gsl::narrow<uint32_t>(utils::parseU64Property(context, MaxBinCount)); logger_->log_debug("BinFiles: MaxBinCount [{}]", maxBinCount_); - if (auto max_bin_age = utils::parseOptionalMsProperty(context, MaxBinAge)) { + if (auto max_bin_age = utils::parseOptionalDurationProperty(context, MaxBinAge)) { // We need to trigger the processor even when there are no incoming flow files so that it can flush the bins. setTriggerWhenEmpty(true); this->binManager_.setBinAge(*max_bin_age); diff --git a/extensions/mqtt/processors/AbstractMQTTProcessor.cpp b/extensions/mqtt/processors/AbstractMQTTProcessor.cpp index 2ae948ca9..d5b50b52f 100644 --- a/extensions/mqtt/processors/AbstractMQTTProcessor.cpp +++ b/extensions/mqtt/processors/AbstractMQTTProcessor.cpp @@ -45,10 +45,10 @@ void AbstractMQTTProcessor::onSchedule(core::ProcessContext& context, core::Proc } logger_->log_debug("AbstractMQTTProcessor: Password [{}]", password_); - keep_alive_interval_ = std::chrono::duration_cast<std::chrono::seconds>(utils::parseMsProperty(context, KeepAliveInterval)); + keep_alive_interval_ = std::chrono::duration_cast<std::chrono::seconds>(utils::parseDurationProperty(context, KeepAliveInterval)); logger_->log_debug("AbstractMQTTProcessor: KeepAliveInterval [{}] s", int64_t{keep_alive_interval_.count()}); - connection_timeout_ = std::chrono::duration_cast<std::chrono::seconds>(utils::parseMsProperty(context, ConnectionTimeout)); + connection_timeout_ = std::chrono::duration_cast<std::chrono::seconds>(utils::parseDurationProperty(context, ConnectionTimeout)); logger_->log_debug("AbstractMQTTProcessor: ConnectionTimeout [{}] s", int64_t{connection_timeout_.count()}); qos_ = utils::parseEnumProperty<mqtt::MqttQoS>(context, QoS); diff --git a/extensions/mqtt/processors/ConsumeMQTT.cpp b/extensions/mqtt/processors/ConsumeMQTT.cpp index 5391f0393..e4e5b1a72 100644 --- a/extensions/mqtt/processors/ConsumeMQTT.cpp +++ b/extensions/mqtt/processors/ConsumeMQTT.cpp @@ -51,7 +51,7 @@ void ConsumeMQTT::readProperties(core::ProcessContext& context) { topic_ = utils::parseProperty(context, Topic); clean_session_ = utils::parseBoolProperty(context, CleanSession); clean_start_ = utils::parseBoolProperty(context, CleanStart); - session_expiry_interval_ = std::chrono::duration_cast<std::chrono::seconds>(utils::parseMsProperty(context, SessionExpiryInterval)); + session_expiry_interval_ = std::chrono::duration_cast<std::chrono::seconds>(utils::parseDurationProperty(context, SessionExpiryInterval)); max_queue_size_ = utils::parseU64Property(context, QueueBufferMaxMessage); attribute_from_content_type_ = context.getProperty(AttributeFromContentType).value_or(""); topic_alias_maximum_ = gsl::narrow<uint16_t>(utils::parseU64Property(context, QueueBufferMaxMessage)); diff --git a/extensions/mqtt/processors/PublishMQTT.cpp b/extensions/mqtt/processors/PublishMQTT.cpp index 40a531f81..f9bcd1970 100644 --- a/extensions/mqtt/processors/PublishMQTT.cpp +++ b/extensions/mqtt/processors/PublishMQTT.cpp @@ -49,7 +49,7 @@ void PublishMQTT::readProperties(core::ProcessContext& context) { throw Exception(PROCESS_SCHEDULE_EXCEPTION, "PublishMQTT: Topic is required"); } retain_ = utils::parseBoolProperty(context, Retain); - message_expiry_interval_ = utils::parseOptionalMsProperty(context, MessageExpiryInterval) | utils::transform([](const auto&& ms) { return std::chrono::duration_cast<std::chrono::seconds>(ms); }); + message_expiry_interval_ = utils::parseOptionalDurationProperty(context, MessageExpiryInterval) | utils::transform([](const auto&& ms) { return std::chrono::duration_cast<std::chrono::seconds>(ms); }); in_flight_message_counter_.setEnabled(mqtt_version_ == mqtt::MqttVersions::V_5_0 && qos_ != mqtt::MqttQoS::LEVEL_0); } diff --git a/extensions/sftp/processors/ListSFTP.cpp b/extensions/sftp/processors/ListSFTP.cpp index 4d8895e4c..a683a3210 100644 --- a/extensions/sftp/processors/ListSFTP.cpp +++ b/extensions/sftp/processors/ListSFTP.cpp @@ -114,8 +114,8 @@ void ListSFTP::onSchedule(core::ProcessContext& context, core::ProcessSessionFac target_system_timestamp_precision_ = utils::parseProperty(context, TargetSystemTimestampPrecision); entity_tracking_initial_listing_target_ = utils::parseProperty(context, EntityTrackingInitialListingTarget); - minimum_file_age_ = utils::parseMsProperty(context, MinimumFileAge); - maximum_file_age_ = utils::parseOptionalMsProperty(context, MaximumFileAge); + minimum_file_age_ = utils::parseDurationProperty(context, MinimumFileAge); + maximum_file_age_ = utils::parseOptionalDurationProperty(context, MaximumFileAge); minimum_file_size_ = utils::parseDataSizeProperty(context, MinimumFileSize); maximum_file_size_ = utils::parseOptionalDataSizeProperty(context, MaximumFileSize); diff --git a/extensions/sftp/processors/SFTPProcessorBase.cpp b/extensions/sftp/processors/SFTPProcessorBase.cpp index d2855153f..c15db998b 100644 --- a/extensions/sftp/processors/SFTPProcessorBase.cpp +++ b/extensions/sftp/processors/SFTPProcessorBase.cpp @@ -72,8 +72,8 @@ void SFTPProcessorBase::notifyStop() { void SFTPProcessorBase::parseCommonPropertiesOnSchedule(core::ProcessContext& context) { strict_host_checking_ = utils::parseBoolProperty(context, StrictHostKeyChecking); host_key_file_ = utils::parseOptionalProperty(context, HostKeyFile).value_or(""); - connection_timeout_ = utils::parseMsProperty(context, ConnectionTimeout); - data_timeout_ = utils::parseMsProperty(context, DataTimeout); + connection_timeout_ = utils::parseDurationProperty(context, ConnectionTimeout); + data_timeout_ = utils::parseDurationProperty(context, DataTimeout); use_keepalive_on_timeout_ = utils::parseBoolProperty(context, SendKeepaliveOnTimeout); proxy_type_ = utils::parseProperty(context, ProxyType); } diff --git a/extensions/smb/ListSmb.cpp b/extensions/smb/ListSmb.cpp index a2ccf31c3..c82c053a3 100644 --- a/extensions/smb/ListSmb.cpp +++ b/extensions/smb/ListSmb.cpp @@ -48,8 +48,8 @@ void ListSmb::onSchedule(core::ProcessContext& context, core::ProcessSessionFact file_filter_.filename_filter = context.getProperty(FileFilter) | utils::transform([] (const auto& str) { return std::regex(str);}) | utils::toOptional(); file_filter_.path_filter = context.getProperty(PathFilter) | utils::transform([] (const auto& str) { return std::regex(str);}) | utils::toOptional(); - file_filter_.minimum_file_age = utils::parseOptionalMsProperty(context, MinimumFileAge); - file_filter_.maximum_file_age = utils::parseOptionalMsProperty(context, MaximumFileAge); + file_filter_.minimum_file_age = utils::parseOptionalDurationProperty(context, MinimumFileAge); + file_filter_.maximum_file_age = utils::parseOptionalDurationProperty(context, MaximumFileAge); file_filter_.minimum_file_size = utils::parseOptionalDataSizeProperty(context, MinimumFileSize); file_filter_.maximum_file_size = utils::parseOptionalDataSizeProperty(context, MaximumFileSize); diff --git a/extensions/splunk/QuerySplunkIndexingStatus.cpp b/extensions/splunk/QuerySplunkIndexingStatus.cpp index ffb18cb91..1f416486a 100644 --- a/extensions/splunk/QuerySplunkIndexingStatus.cpp +++ b/extensions/splunk/QuerySplunkIndexingStatus.cpp @@ -139,7 +139,7 @@ void QuerySplunkIndexingStatus::initialize() { void QuerySplunkIndexingStatus::onSchedule(core::ProcessContext& context, core::ProcessSessionFactory& session_factory) { SplunkHECProcessor::onSchedule(context, session_factory); - max_age_ = utils::parseMsProperty(context, MaximumWaitingTime); + max_age_ = utils::parseDurationProperty(context, MaximumWaitingTime); batch_size_ = utils::parseU64Property(context, MaxQuerySize); initializeClient(client_, getNetworkLocation().append(getEndpoint()), getSSLContextService(context)); } diff --git a/extensions/standard-processors/modbus/FetchModbusTcp.cpp b/extensions/standard-processors/modbus/FetchModbusTcp.cpp index 0e76bcc32..489712b91 100644 --- a/extensions/standard-processors/modbus/FetchModbusTcp.cpp +++ b/extensions/standard-processors/modbus/FetchModbusTcp.cpp @@ -48,8 +48,8 @@ void FetchModbusTcp::onSchedule(core::ProcessContext& context, core::ProcessSess throw Exception{ExceptionType::PROCESS_SCHEDULE_EXCEPTION, "missing port"}; } - idle_connection_expiration_ = utils::parseOptionalMsProperty(context, IdleConnectionExpiration); - timeout_duration_ = utils::parseOptionalMsProperty(context, Timeout).value_or(15s); + idle_connection_expiration_ = utils::parseOptionalDurationProperty(context, IdleConnectionExpiration); + timeout_duration_ = utils::parseOptionalDurationProperty(context, Timeout).value_or(15s); if (context.getProperty(ConnectionPerFlowFile) | utils::andThen(parsing::parseBool) | utils::expect("FetchModbusTcp::ConnectionPerFlowFile is required property")) { diff --git a/extensions/standard-processors/processors/GetFile.cpp b/extensions/standard-processors/processors/GetFile.cpp index c0517262a..41894fa14 100644 --- a/extensions/standard-processors/processors/GetFile.cpp +++ b/extensions/standard-processors/processors/GetFile.cpp @@ -47,11 +47,11 @@ void GetFile::onSchedule(core::ProcessContext& context, core::ProcessSessionFact request_.batchSize = utils::parseU64Property(context, BatchSize); request_.ignoreHiddenFile = utils::parseBoolProperty(context, IgnoreHiddenFile); request_.keepSourceFile = utils::parseBoolProperty(context, KeepSourceFile); - request_.maxAge = utils::parseMsProperty(context, MaxAge); - request_.minAge = utils::parseMsProperty(context, MinAge); + request_.maxAge = utils::parseDurationProperty(context, MaxAge); + request_.minAge = utils::parseDurationProperty(context, MinAge); request_.maxSize = utils::parseDataSizeProperty(context, MaxSize); request_.minSize = utils::parseDataSizeProperty(context, MinSize); - request_.pollInterval = utils::parseMsProperty(context, PollInterval); + request_.pollInterval = utils::parseDurationProperty(context, PollInterval); request_.recursive = utils::parseBoolProperty(context, Recurse); request_.fileFilter = utils::parseProperty(context, FileFilter); diff --git a/extensions/standard-processors/processors/GetTCP.cpp b/extensions/standard-processors/processors/GetTCP.cpp index 7e52aa1c4..c694ac549 100644 --- a/extensions/standard-processors/processors/GetTCP.cpp +++ b/extensions/standard-processors/processors/GetTCP.cpp @@ -101,12 +101,12 @@ void GetTCP::onSchedule(core::ProcessContext& context, core::ProcessSessionFacto asio::steady_timer::duration timeout_duration = 1s; - if (auto timeout_value = utils::parseOptionalMsProperty(context, Timeout)) { + if (auto timeout_value = utils::parseOptionalDurationProperty(context, Timeout)) { timeout_duration = *timeout_value; } asio::steady_timer::duration reconnection_interval = 1min; - if (auto reconnect_interval_value = utils::parseOptionalMsProperty(context, ReconnectInterval)) { + if (auto reconnect_interval_value = utils::parseOptionalDurationProperty(context, ReconnectInterval)) { reconnection_interval = *reconnect_interval_value;; } diff --git a/extensions/standard-processors/processors/InvokeHTTP.cpp b/extensions/standard-processors/processors/InvokeHTTP.cpp index 56eb09adf..4a2c1ddda 100644 --- a/extensions/standard-processors/processors/InvokeHTTP.cpp +++ b/extensions/standard-processors/processors/InvokeHTTP.cpp @@ -154,8 +154,8 @@ void InvokeHTTP::setupMembersFromProperties(const core::ProcessContext& context) maximum_upload_speed_ = context.getProperty(UploadSpeedLimit) | utils::andThen(invoke_http::parseDataTransferSpeed) | utils::toOptional(); maximum_download_speed_ = context.getProperty(DownloadSpeedLimit) | utils::andThen(invoke_http::parseDataTransferSpeed) | utils::toOptional(); - connect_timeout_ = utils::parseMsProperty(context, ConnectTimeout); // Shouldn't fail due to default value; - read_timeout_ = utils::parseMsProperty(context, ReadTimeout); // Shouldn't fail due to default value; + connect_timeout_ = utils::parseDurationProperty(context, ConnectTimeout); // Shouldn't fail due to default value; + read_timeout_ = utils::parseDurationProperty(context, ReadTimeout); // Shouldn't fail due to default value; proxy_.host = context.getProperty(InvokeHTTP::ProxyHost).value_or(""); proxy_.port = (context.getProperty(InvokeHTTP::ProxyPort) | utils::andThen(parsing::parseIntegral<int>)).value_or(0); diff --git a/extensions/standard-processors/processors/ListFile.cpp b/extensions/standard-processors/processors/ListFile.cpp index 90dd2793b..66618ad33 100644 --- a/extensions/standard-processors/processors/ListFile.cpp +++ b/extensions/standard-processors/processors/ListFile.cpp @@ -46,8 +46,8 @@ void ListFile::onSchedule(core::ProcessContext& context, core::ProcessSessionFac file_filter_.filename_filter = context.getProperty(FileFilter) | utils::transform([] (const auto& str) { return std::regex(str);}) | utils::toOptional(); file_filter_.path_filter = context.getProperty(PathFilter) | utils::transform([] (const auto& str) { return std::regex(str);}) | utils::toOptional(); - file_filter_.minimum_file_age = utils::parseOptionalMsProperty(context, MinimumFileAge); - file_filter_.maximum_file_age = utils::parseOptionalMsProperty(context, MaximumFileAge); + file_filter_.minimum_file_age = utils::parseOptionalDurationProperty(context, MinimumFileAge); + file_filter_.maximum_file_age = utils::parseOptionalDurationProperty(context, MaximumFileAge); file_filter_.minimum_file_size = utils::parseOptionalDataSizeProperty(context, MinimumFileSize); file_filter_.maximum_file_size = utils::parseOptionalDataSizeProperty(context, MaximumFileSize); diff --git a/extensions/standard-processors/processors/PutTCP.cpp b/extensions/standard-processors/processors/PutTCP.cpp index e73ca6087..404965043 100644 --- a/extensions/standard-processors/processors/PutTCP.cpp +++ b/extensions/standard-processors/processors/PutTCP.cpp @@ -58,12 +58,12 @@ void PutTCP::onSchedule(core::ProcessContext& context, core::ProcessSessionFacto if (!getProperty(Port.name)) { throw Exception{ExceptionType::PROCESSOR_EXCEPTION, "missing port"}; } - if (const auto idle_connection_expiration = utils::parseOptionalMsProperty(context, IdleConnectionExpiration); idle_connection_expiration && *idle_connection_expiration > 0ms) + if (const auto idle_connection_expiration = utils::parseOptionalDurationProperty(context, IdleConnectionExpiration); idle_connection_expiration && *idle_connection_expiration > 0ms) idle_connection_expiration_ = idle_connection_expiration; else idle_connection_expiration_.reset(); - if (const auto timeout = utils::parseOptionalMsProperty(context, Timeout); timeout && *timeout > 0ms) + if (const auto timeout = utils::parseOptionalDurationProperty(context, Timeout); timeout && *timeout > 0ms) timeout_duration_ = *timeout; else timeout_duration_ = 15s; diff --git a/extensions/standard-processors/processors/TailFile.cpp b/extensions/standard-processors/processors/TailFile.cpp index e14743f4b..9cf889c13 100644 --- a/extensions/standard-processors/processors/TailFile.cpp +++ b/extensions/standard-processors/processors/TailFile.cpp @@ -272,7 +272,7 @@ void TailFile::onSchedule(core::ProcessContext& context, core::ProcessSessionFac } recursive_lookup_ = utils::parseBoolProperty(context, RecursiveLookup); - lookup_frequency_ = utils::parseMsProperty(context, LookupFrequency); + lookup_frequency_ = utils::parseDurationProperty(context, LookupFrequency); recoverState(context);
