This is an automated email from the ASF dual-hosted git repository.
pvillard pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 6351580183 NIFI-15157 Reduced Shutdown Quiet Period in PutSyslog to
200 ms
6351580183 is described below
commit 63515801834b1c05659cf241e735d86a030b945d
Author: exceptionfactory <[email protected]>
AuthorDate: Wed Oct 29 20:54:48 2025 -0500
NIFI-15157 Reduced Shutdown Quiet Period in PutSyslog to 200 ms
Signed-off-by: Pierre Villard <[email protected]>
This closes #10477.
---
.../main/java/org/apache/nifi/processors/standard/PutSyslog.java | 2 ++
.../java/org/apache/nifi/processors/standard/TestPutSyslog.java | 7 +++----
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutSyslog.java
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutSyslog.java
index 833b237547..ea5ffe2633 100644
---
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutSyslog.java
+++
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutSyslog.java
@@ -30,6 +30,7 @@ import org.apache.nifi.components.ValidationContext;
import org.apache.nifi.components.ValidationResult;
import org.apache.nifi.event.transport.EventSender;
import org.apache.nifi.event.transport.configuration.LineEnding;
+import org.apache.nifi.event.transport.configuration.ShutdownQuietPeriod;
import org.apache.nifi.event.transport.configuration.TransportProtocol;
import org.apache.nifi.event.transport.netty.StringNettyEventSenderFactory;
import org.apache.nifi.expression.ExpressionLanguageScope;
@@ -284,6 +285,7 @@ public class PutSyslog extends AbstractSyslogProcessor {
}
}
+
factory.setShutdownQuietPeriod(ShutdownQuietPeriod.QUICK.getDuration());
return factory.getEventSender();
}
diff --git
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestPutSyslog.java
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestPutSyslog.java
index 928297abf0..64dfdeba36 100644
---
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestPutSyslog.java
+++
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestPutSyslog.java
@@ -79,8 +79,6 @@ public class TestPutSyslog {
private final TransportProtocol protocol = TransportProtocol.UDP;
- private InetAddress address;
-
private int port;
private EventServer eventServer;
private BlockingQueue<ByteArrayMessage> messages;
@@ -90,7 +88,7 @@ public class TestPutSyslog {
final byte[] delimiter = DELIMITER.getBytes(CHARSET);
messages = new LinkedBlockingQueue<>();
- address = InetAddress.getByName(ADDRESS);
+ final InetAddress address = InetAddress.getByName(ADDRESS);
final NettyEventServerFactory serverFactory = new
ByteArrayMessageNettyEventServerFactory(
new MockComponentLog("id", "TestPutSyslog"), address, 0, protocol,
delimiter, MAX_FRAME_LENGTH, messages);
serverFactory.setShutdownQuietPeriod(ShutdownQuietPeriod.QUICK.getDuration());
@@ -160,6 +158,7 @@ public class TestPutSyslog {
runner.run();
final ByteArrayMessage message =
messages.poll(POLL_TIMEOUT_SECONDS, TimeUnit.SECONDS);
+ assertNotNull(message);
final String syslogMessage = new String(message.getMessage(),
CHARSET);
runner.assertAllFlowFilesTransferred(PutSyslog.REL_SUCCESS);
@@ -173,7 +172,7 @@ public class TestPutSyslog {
private void assertProvenanceRecordTransitUriFound() {
final List<ProvenanceEventRecord> provenanceEvents =
runner.getProvenanceEvents();
assertFalse(provenanceEvents.isEmpty(), "Provenance Events not found");
- final ProvenanceEventRecord provenanceEventRecord =
provenanceEvents.iterator().next();
+ final ProvenanceEventRecord provenanceEventRecord =
provenanceEvents.getFirst();
assertEquals(ProvenanceEventType.SEND,
provenanceEventRecord.getEventType());
final String transitUri = provenanceEventRecord.getTransitUri();