Adding upstream version 8.2402.0.upstream/8.2402.0

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

1 files changed, 102 insertions, 0 deletions

diff --git a/tests/imfile-readmode2-with-persists-data-during-stop.sh b/tests/imfile-readmode2-with-persists-data-during-stop.sh
new file mode 100755
index 0000000..552e181
--- /dev/null
+++ b/tests/imfile-readmode2-with-persists-data-during-stop.sh
@@ -0,0 +1,102 @@
+#!/bin/bash
+# This is part of the rsyslog testbench, licensed under ASL 2.0
+. $srcdir/diag.sh check-inotify
+. ${srcdir:=.}/diag.sh init
+generate_conf
+add_conf '
+global(workDirectory="'${RSYSLOG_DYNNAME}'.spool")
+module(load="../plugins/imfile/.libs/imfile")
+
+input(type="imfile"
+      File="./'$RSYSLOG_DYNNAME'.input"
+      Tag="file:"
+      ReadMode="2")
+
+template(name="outfmt" type="list") {
+  constant(value="HEADER ")
+  property(name="msg" format="json")
+  constant(value="\n")
+}
+
+if $msg contains "msgnum:" then
+ action(
+   type="omfile"
+   file=`echo $RSYSLOG_OUT_LOG`
+   template="outfmt"
+ )
+'
+startup
+
+# write the beginning of the file
+echo 'msgnum:0
+ msgnum:1' > $RSYSLOG_DYNNAME.input
+echo 'msgnum:2' >> $RSYSLOG_DYNNAME.input
+
+# sleep a little to give rsyslog a chance to begin processing
+sleep 1
+
+# now stop and restart rsyslog so that the file info must be
+# persisted and read again on startup. Results should still be
+# correct ;)
+echo stopping rsyslog
+shutdown_when_empty
+wait_shutdown
+
+# write some more lines - we want to check here if the initial
+# polling loop properly picks up that data. Note that even in
+# inotify case we do have one polling loop at startup, as this
+# is required to find data written while we were stopped.
+ls -l ${RSYSLOG_DYNNAME}.spool
+
+echo 'msgnum:3
+ msgnum:4' >> $RSYSLOG_DYNNAME.input
+
+echo restarting rsyslog
+startup
+echo restarted rsyslog, continuing with test
+
+echo ' msgnum:5' >> $RSYSLOG_DYNNAME.input
+echo 'msgnum:6
+ msgnum:7
+msgnum:8' >> $RSYSLOG_DYNNAME.input
+#msgnum:8 must NOT be written as it is unfinished
+
+# give it time to finish
+sleep 1
+
+shutdown_when_empty # shut down rsyslogd when done processing messages
+wait_shutdown    # we need to wait until rsyslogd is finished!
+
+# give it time to write the output file
+sleep 1
+
+## check if we have the correct number of messages
+
+NUMLINES=$(grep -c HEADER  $RSYSLOG_OUT_LOG 2>/dev/null)
+
+if [ -z $NUMLINES ]; then
+  echo "ERROR: expecting at least a match for HEADER, maybe  $RSYSLOG_OUT_LOG wasn't even written?"
+  cat $RSYSLOG_OUT_LOG
+  error_exit 1
+else
+  if [ ! $NUMLINES -eq 4 ]; then
+    echo "ERROR: expecting 4 headers, got $NUMLINES"
+    cat $RSYSLOG_OUT_LOG
+    error_exit 1
+  fi
+fi
+
+## check if all the data we expect to get in the file is there
+
+for i in {1..7}; do
+  grep msgnum:$i  $RSYSLOG_OUT_LOG > /dev/null 2>&1
+  if [ ! $? -eq 0 ]; then
+    echo "ERROR: expecting the string 'msgnum:$i', it's not there"
+    cat $RSYSLOG_OUT_LOG
+    error_exit 1
+  fi
+done
+
+## if we got here, all is good :)
+
+exit_test