Adding upstream version 8.2402.0.upstream/8.2402.0

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 71 insertions, 0 deletions

diff --git a/tests/omprog-single-instance-outfile.sh b/tests/omprog-single-instance-outfile.sh
new file mode 100755
index 0000000..2ab789e
--- /dev/null
+++ b/tests/omprog-single-instance-outfile.sh
@@ -0,0 +1,71 @@
+#!/bin/bash
+# This file is part of the rsyslog project, released under ASL 2.0
+
+# Similar to the 'omprog-single-instance.sh' test, using the 'output'
+# parameter. Checks that the output of the program is correctly captured
+# when the 'forceSingleInstance' flag is enabled.
+
+. ${srcdir:=.}/diag.sh init
+skip_platform "SunOS"  "This test currently does not work on Solaris"
+export NUMMESSAGES=10000  # number of logs to send
+export QUEUE_EMPTY_CHECK_FUNC=wait_file_lines
+generate_conf
+add_conf '
+module(load="../plugins/omprog/.libs/omprog")
+
+template(name="outfmt" type="string" string="%msg%\n")
+
+:msg, contains, "msgnum:" {
+    action(
+        type="omprog"
+        binary="'$srcdir'/testsuites/omprog-single-instance-bin.sh"
+        template="outfmt"
+        name="omprog_action"
+        confirmMessages="on"
+        forceSingleInstance="on"
+        queue.type="LinkedList"  # use a dedicated queue
+        queue.workerThreads="10"  # ...with multiple workers
+        queue.size="5000"  # ...high capacity (default is 1000)
+        queue.timeoutShutdown="30000"  # ...and a long shutdown timeout
+        output="'$RSYSLOG2_OUT_LOG'"
+    )
+}
+'
+startup
+injectmsg
+shutdown_when_empty
+wait_shutdown
+
+EXPECTED_LINE_LENGTH=34    # example line: '[stderr] Received msgnum:00009880:'
+line_num=0
+while IFS= read -r line; do
+    ((line_num++))
+    if (( line_num == 1 )); then
+        if [[ "$line" != "[stderr] Starting" ]]; then
+            echo "unexpected first line in captured stderr: $line"
+            error_exit 1
+        fi
+    elif (( line_num == NUMMESSAGES + 2 )); then
+        if [[ "$line" != "[stderr] Terminating" ]]; then
+            echo "unexpected last line in captured stderr: $line"
+            error_exit 1
+        fi
+    elif [[ ${#line} != $EXPECTED_LINE_LENGTH ]]; then
+        echo "unexpected line in captured stderr (line $line_num): $line"
+        error_exit 1
+    fi
+done < $RSYSLOG2_OUT_LOG
+
+if (( line_num != NUMMESSAGES + 2 )); then
+    echo "unexpected line count in captured stderr: $line_num (expected: $((NUMMESSAGES + 2)))"
+    error_exit 1
+fi
+
+# Note: we use awk here to remove leading spaces returned by wc on FreeBSD
+line_count=$(wc -l < ${RSYSLOG_OUT_LOG} | awk '{print $1}')
+if (( line_count != NUMMESSAGES + 2 )); then
+    echo "unexpected line count in output: $line_count (expected: $((NUMMESSAGES + 2)))"
+    error_exit 1
+fi
+
+exit_test