imfile: implemented wildcard support into FEN mode (solaris)

Partitionally moved inotify code to global imfile code as needed
for FEN Mode.
Enabled all wildcard tests that are supported by FEN API.

tests/imfile-file-not-found-error.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 # add 2017-04-28 by Pascal Withopf, released under ASL 2.0
 echo [imfile-file-not-found-error.sh]
-. $srcdir/diag.sh check-inotify
+. $srcdir/diag.sh check-inotify-only
 . $srcdir/diag.sh init
 . $srcdir/diag.sh generate-conf
 . $srcdir/diag.sh add-conf '

tests/imfile-wildcards-dirs-multi.sh

@@ -1,23 +1,10 @@
 #!/bin/bash
 # This is part of the rsyslog testbench, licensed under GPLv3
-echo [imfile-wildcards-multi.sh]
-
-uname
-if [ `uname` = "FreeBSD" ] ; then
-   echo "This test currently does not work on FreeBSD."
-   exit 77
-fi
-
-if [ `uname` = "SunOS" ] ; then
-   echo "Solaris does not support inotify."
-   exit 77
-fi
-
-
 export IMFILEINPUTFILES="10"
 export IMFILEINPUTFILESSTEPS="5"
 export IMFILEINPUTFILESALL=$(($IMFILEINPUTFILES * $IMFILEINPUTFILESSTEPS))
-
+echo [imfile-wildcards-multi.sh]
+. $srcdir/diag.sh check-inotify
 . $srcdir/diag.sh init
 # generate input files first. Note that rsyslog processes it as
 # soon as it start up (so the file should exist at that point).
@@ -34,17 +21,20 @@ do
 	for i in `seq 1 $IMFILEINPUTFILES`;
 	do
 		mkdir rsyslog.input.dir$i
-		./msleep 25
+		./msleep 50
 		mkdir rsyslog.input.dir$i/dir$i
-		./msleep 25
+		./msleep 50
 		./inputfilegen -m 1 > rsyslog.input.dir$i/dir$i/file.logfile
+		./msleep 100
 	done
 	ls -d rsyslog.input.*
 
 	# Delete all but first!
 	for i in `seq 1 $IMFILEINPUTFILES`;
 	do
-		rm -r rsyslog.input.dir$i
+		rm -rf rsyslog.input.dir$i/dir$i/file.logfile
+		./msleep 100
+		rm -rf rsyslog.input.dir$i
 	done
 done
 

tests/imfile-wildcards-dirs-multi2.sh

@@ -1,24 +1,10 @@
 #!/bin/bash
 # This is part of the rsyslog testbench, licensed under GPLv3
-echo [imfile-wildcards-multi2.sh]
-
-uname
-if [ `uname` = "FreeBSD" ] ; then
-   echo "This test currently does not work on FreeBSD."
-   exit 77
-fi
-
-if [ `uname` = "SunOS" ] ; then
-   echo "Solaris does not support inotify."
-   exit 77
-fi
-
-
 export IMFILEINPUTFILES="1"
 export IMFILEINPUTFILESSTEPS="5"
 export IMFILEINPUTFILESALL=$(($IMFILEINPUTFILES * $IMFILEINPUTFILESSTEPS))
-
-
+echo [imfile-wildcards-multi2.sh]
+. $srcdir/diag.sh check-inotify-only
 . $srcdir/diag.sh init
 # generate input files first. Note that rsyslog processes it as
 # soon as it start up (so the file should exist at that point).
@@ -46,15 +32,17 @@ do
 		mkdir rsyslog.input.dir$i/dir$j/testdir
 		./msleep 25
 		./inputfilegen -m 1 > rsyslog.input.dir$i/dir$j/testdir/file.logfile
+		./msleep 50
 	done
 	ls -d rsyslog.input.*
 
 	# Delete all but first!
 	for i in `seq 1 $IMFILEINPUTFILES`;
 	do
-		rm -r rsyslog.input.dir$i/dir$j
+		rm -rf rsyslog.input.dir$i/dir$j/testdir/file.logfile
+		./msleep 50
+		rm -rr rsyslog.input.dir$i/dir$j
 	done
-
 done
 
 # sleep a little to give rsyslog a chance for processing

tests/imfile-wildcards-dirs.sh

@@ -1,21 +1,8 @@
 #!/bin/bash
 # This is part of the rsyslog testbench, licensed under GPLv3
-echo [imfile-wildcards-dirs.sh]
-
-uname
-if [ `uname` = "FreeBSD" ] ; then
-   echo "This test currently does not work on FreeBSD."
-   exit 77
-fi
-
-if [ `uname` = "SunOS" ] ; then
-   echo "Solaris does not support inotify."
-   exit 77
-fi
-
-
 export IMFILEINPUTFILES="10"
-
+echo [imfile-wildcards-dirs.sh]
+. $srcdir/diag.sh check-inotify-only
 . $srcdir/diag.sh init
 # generate input files first. Note that rsyslog processes it as
 # soon as it start up (so the file should exist at that point).
@@ -28,9 +15,10 @@ sleep 1
 for i in `seq 1 $IMFILEINPUTFILES`;
 do
 	mkdir rsyslog.input.dir$i
-	./msleep 50
 	./inputfilegen -m 1 > rsyslog.input.dir$i/file.logfile
 done
+# wait for imfile to process
+./msleep 250 
 ls -d rsyslog.input.*
 
 # sleep a little to give rsyslog a chance for processing

tests/imfile-wildcards-dirs2.sh

@@ -1,23 +1,10 @@
 #!/bin/bash
 # This is part of the rsyslog testbench, licensed under GPLv3
-echo [imfile-wildcards-dirs2.sh]
-
-uname
-if [ `uname` = "FreeBSD" ] ; then
-   echo "This test currently does not work on FreeBSD."
-   exit 77
-fi
-
-if [ `uname` = "SunOS" ] ; then
-   echo "Solaris does not support inotify."
-   exit 77
-fi
-
-
 export IMFILEINPUTFILES="10"
 export IMFILEINPUTFILESSTEPS="5"
 export IMFILEINPUTFILESALL=$(($IMFILEINPUTFILES * $IMFILEINPUTFILESSTEPS))
-
+echo [imfile-wildcards-dirs2.sh]
+. $srcdir/diag.sh check-inotify
 . $srcdir/diag.sh init
 # generate input files first. Note that rsyslog processes it as
 # soon as it start up (so the file should exist at that point).
@@ -42,7 +29,8 @@ do
 	# Delete all but first!
 	for i in `seq 1 $IMFILEINPUTFILES`;
 	do
-		rm -r rsyslog.input.dir$i
+#		rm -rf rsyslog.input.dir$i/file.logfile
+		rm -rf rsyslog.input.dir$i/
 	done
 done
 

tests/imfile-wildcards.sh

@@ -2,7 +2,7 @@
 # This is part of the rsyslog testbench, licensed under GPLv3
 export IMFILEINPUTFILES="10"
 echo [imfile-wildcards.sh]
-. $srcdir/diag.sh check-inotify-only
+. $srcdir/diag.sh check-inotify
 . $srcdir/diag.sh init
 # generate input files first. Note that rsyslog processes it as
 # soon as it start up (so the file should exist at that point).
@@ -19,6 +19,8 @@ for i in `seq 2 $IMFILEINPUTFILES`;
 do
 	cp $imfilebefore rsyslog.input.$i.log
 	imfilebefore="rsyslog.input.$i.log"
+	# Wait little for correct timing
+	./msleep 50
 done
 ./inputfilegen -m 3 > rsyslog.input.$((IMFILEINPUTFILES + 1)).log
 ls -l rsyslog.input.*

tests/testsuites/imfile-wildcards-dirs-multi.conf

@@ -1,6 +1,12 @@
 $IncludeConfig diag-common.conf
 $WorkDirectory test-spool
 
+/* Filter out busy debug output, comment out if needed */
+global(
+	debug.whitelist="off"
+	debug.files=["rainerscript.c", "ratelimit.c", "ruleset.c", "main Q", "msg.c", "../action.c"]
+)
+
 module(	load="../plugins/imfile/.libs/imfile" 
 	mode="inotify" 
 	PollingInterval="1")

tests/testsuites/imfile-wildcards-dirs-multi2.conf

@@ -1,6 +1,12 @@
 $IncludeConfig diag-common.conf
 $WorkDirectory test-spool
 
+/* Filter out busy debug output, comment out if needed */
+global(
+	debug.whitelist="off"
+	debug.files=["rainerscript.c", "ratelimit.c", "ruleset.c", "main Q", "msg.c", "../action.c"]
+)
+
 module(	load="../plugins/imfile/.libs/imfile" 
 	mode="inotify" 
 	PollingInterval="1")

tests/testsuites/imfile-wildcards-dirs.conf

@@ -1,6 +1,12 @@
 $IncludeConfig diag-common.conf
 $WorkDirectory test-spool
 
+/* Filter out busy debug output, comment out if needed */
+global(
+	debug.whitelist="off"
+	debug.files=["rainerscript.c", "ratelimit.c", "ruleset.c", "main Q", "msg.c", "../action.c"]
+)
+
 module(	load="../plugins/imfile/.libs/imfile" 
 	mode="inotify" 
 	PollingInterval="1")

tests/testsuites/imfile-wildcards-simple.conf

@@ -1,6 +1,12 @@
 $IncludeConfig diag-common.conf
 $WorkDirectory test-spool
 
+/* Filter out busy debug output */
+global(
+	debug.whitelist="off"
+	debug.files=["rainerscript.c", "ratelimit.c", "ruleset.c", "main Q", "msg.c", "../action.c"]
+	)
+
 module(	load="../plugins/imfile/.libs/imfile" 
 	mode="inotify" 
 	PollingInterval="1")