public inbox for ltp@lists.linux.it
 help / color / mirror / Atom feed
* [LTP] [PATCH] syslog: rsyslog doesn't create empty log files
@ 2014-05-28 10:15 Jiri Jaburek
  2014-06-05 10:35 ` Jan Stancek
  0 siblings, 1 reply; 5+ messages in thread
From: Jiri Jaburek @ 2014-05-28 10:15 UTC (permalink / raw)
  To: ltp-list

Newer versions of rsyslog don't create empty log files during startup -
the files are created upon first logged entry instead.

(since rsyslog git commit de77494415ae8c169949d13ed0df0af3b1949b54)

Signed-off-by: Jiri Jaburek <jjaburek@redhat.com>
---
 testcases/kernel/syscalls/syslog/syslog01 | 15 +++++++++++----
 testcases/kernel/syscalls/syslog/syslog02 | 16 +++++++++++-----
 testcases/kernel/syscalls/syslog/syslog09 | 15 +++++++++++----
 3 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/testcases/kernel/syscalls/syslog/syslog01 b/testcases/kernel/syscalls/syslog/syslog01
index b7bcd9e..b9c7c7f 100755
--- a/testcases/kernel/syscalls/syslog/syslog01
+++ b/testcases/kernel/syscalls/syslog/syslog01
@@ -67,10 +67,17 @@ syslog_case1()
 	restart_syslog_daemon
 
 	# check if $MAILLOG script exists
-	if [ "$CONFIG_FILE" != "/etc/syslog-ng/syslog-ng.conf" -a ! -e $MAILLOG ]; then
-		tst_resm TBROK "$MAILLOG no such log file"
-		cleanup 1
-	fi
+	case "$CONFIG_FILE" in
+	/etc/syslog-ng/syslog-ng.conf|/etc/rsyslog.conf)
+		# syslog-ng and rsyslog don't create empty log files
+		;;
+	*)
+		if [ ! -e $MAILLOG ]; then
+			tst_resm TBROK "$MAILLOG no such log file"
+			cleanup 1
+		fi
+		;;
+	esac
 
 	# Grepping pattern has to be changed whenever the executable name
 	# changes, ex: syslogtst executable.
diff --git a/testcases/kernel/syscalls/syslog/syslog02 b/testcases/kernel/syscalls/syslog/syslog02
index a416344..c863daa 100755
--- a/testcases/kernel/syscalls/syslog/syslog02
+++ b/testcases/kernel/syscalls/syslog/syslog02
@@ -68,11 +68,17 @@ syslog_case2()
 		# Grepping pattern is as follows:
 		# syslogtst: mail $level test.
 		# check if $MAILLOG script exists
-		if [ "$CONFIG_FILE" != "/etc/syslog-ng/syslog-ng.conf" -a ! -e $MAILLOG ]; then
-			tst_resm TBROK "$MAILLOG no such log file"
-			cleanup 1
-		fi
-
+		case "$CONFIG_FILE" in
+		/etc/syslog-ng/syslog-ng.conf|/etc/rsyslog.conf)
+			# syslog-ng and rsyslog don't create empty log files
+			;;
+		*)
+			if [ ! -e $MAILLOG ]; then
+				tst_resm TBROK "$MAILLOG no such log file"
+				cleanup 1
+			fi
+			;;
+		esac
 
 		# Grepping pattern has to be changed whenever the executable name
 		# changes, ex: syslogtst executable.
diff --git a/testcases/kernel/syscalls/syslog/syslog09 b/testcases/kernel/syscalls/syslog/syslog09
index de06fb1..c488f43 100755
--- a/testcases/kernel/syscalls/syslog/syslog09
+++ b/testcases/kernel/syscalls/syslog/syslog09
@@ -57,10 +57,17 @@ syslog_case9()
 	restart_syslog_daemon
 
 	# check if /var/log/messages script exists
-	if [ "$CONFIG_FILE" != "/etc/syslog-ng/syslog-ng.conf" -a ! -e /var/log/messages ]; then
-		tst_resm TBROK "/var/log/messages no such log file"
-		cleanup 1
-	fi
+	case "$CONFIG_FILE" in
+	/etc/syslog-ng/syslog-ng.conf|/etc/rsyslog.conf)
+		# syslog-ng and rsyslog don't create empty log files
+		;;
+	*)
+		if [ ! -e /var/log/messages ]; then
+			tst_resm TBROK "/var/log/messages no such log file"
+			cleanup 1
+		fi
+		;;
+	esac
 
 	allow1=`grep -c "syslogtst: error level is logged" /var/log/messages`
 	donot_allow1=`grep -c "syslogtst: warning level not to be logged" /var/log/messages`
-- 
1.8.3.1


------------------------------------------------------------------------------
Time is money. Stop wasting it! Get your web API in 5 minutes.
www.restlet.com/download
http://p.sf.net/sfu/restlet
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: [LTP] [PATCH] syslog: rsyslog doesn't create empty log files
  2014-05-28 10:15 [LTP] [PATCH] syslog: rsyslog doesn't create empty log files Jiri Jaburek
@ 2014-06-05 10:35 ` Jan Stancek
  2014-06-05 11:30   ` Jiri Jaburek
  2014-06-05 14:37   ` [LTP] [PATCH v2] " Jiri Jaburek
  0 siblings, 2 replies; 5+ messages in thread
From: Jan Stancek @ 2014-06-05 10:35 UTC (permalink / raw)
  To: Jiri Jaburek; +Cc: ltp-list

Hi Jiri,

I was thinking about removing that check, and checking file existence
only after test generates some log entry. That would make things simpler
and we would still know if there is logfile after syslogtst ran:


diff --git a/testcases/kernel/syscalls/syslog/syslog01 b/testcases/kernel/syscalls/syslog/syslog01
index b7bcd9e..2f3aea0 100755
--- a/testcases/kernel/syscalls/syslog/syslog01
+++ b/testcases/kernel/syscalls/syslog/syslog01
@@ -66,12 +66,6 @@ syslog_case1()
 
        restart_syslog_daemon
 
-       # check if $MAILLOG script exists
-       if [ "$CONFIG_FILE" != "/etc/syslog-ng/syslog-ng.conf" -a ! -e $MAILLOG ]; then
-               tst_resm TBROK "$MAILLOG no such log file"
-               cleanup 1
-       fi
-
        # Grepping pattern has to be changed whenever the executable name
        # changes, ex: syslogtst executable.
        # This check is neccessary for syslog-ng because $MAILLOG is
@@ -87,6 +81,11 @@ syslog_case1()
 
                sleep 2
 
+               if [ ! -e $MAILLOG ]; then
+                       tst_resm TBROK "$MAILLOG no such log file"
+                       cleanup 1
+               fi
+
                newvalue1=`grep -c "syslogtst: mail info test" $MAILLOG`
                if [ "x$(( $newvalue1 - $oldvalue1 ))" != "x1" ]; then
                        status_flag=1
diff --git a/testcases/kernel/syscalls/syslog/syslog02 b/testcases/kernel/syscalls/syslog/syslog02
index a416344..7a55a84 100755
--- a/testcases/kernel/syscalls/syslog/syslog02
+++ b/testcases/kernel/syscalls/syslog/syslog02
@@ -65,15 +65,6 @@ syslog_case2()
 
                restart_syslog_daemon
 
-               # Grepping pattern is as follows:
-               # syslogtst: mail $level test.
-               # check if $MAILLOG script exists
-               if [ "$CONFIG_FILE" != "/etc/syslog-ng/syslog-ng.conf" -a ! -e $MAILLOG ]; then
-                       tst_resm TBROK "$MAILLOG no such log file"
-                       cleanup 1
-               fi
-
-
                # Grepping pattern has to be changed whenever the executable name
                # changes, ex: syslogtst executable.
                # This check is neccessary for syslog-ng because $MAILLOG is
diff --git a/testcases/kernel/syscalls/syslog/syslog09 b/testcases/kernel/syscalls/syslog/syslog09
index de06fb1..9cfafa8 100755
--- a/testcases/kernel/syscalls/syslog/syslog09
+++ b/testcases/kernel/syscalls/syslog/syslog09
@@ -56,15 +56,14 @@ syslog_case9()
 
        restart_syslog_daemon
 
-       # check if /var/log/messages script exists
-       if [ "$CONFIG_FILE" != "/etc/syslog-ng/syslog-ng.conf" -a ! -e /var/log/messages ]; then
-               tst_resm TBROK "/var/log/messages no such log file"
-               cleanup 1
+       if [ -e /var/log/messages ]; then
+               allow1=`grep -c "syslogtst: error level is logged" /var/log/messages`
+               donot_allow1=`grep -c "syslogtst: warning level not to be logged" /var/log/messages`
+       else
+               allow1=0
+               donot_allow1=0
        fi
 
-       allow1=`grep -c "syslogtst: error level is logged" /var/log/messages`
-       donot_allow1=`grep -c "syslogtst: warning level not to be logged" /var/log/messages`
-
        if ! syslogtst 9 2>/dev/null; then
                cleanup 1
        fi

What do you think?

Regards,
Jan

----- Original Message -----
> From: "Jiri Jaburek" <jjaburek@redhat.com>
> To: ltp-list@lists.sourceforge.net
> Sent: Wednesday, 28 May, 2014 12:15:51 PM
> Subject: [LTP] [PATCH] syslog: rsyslog doesn't create empty log files
> 
> Newer versions of rsyslog don't create empty log files during startup -
> the files are created upon first logged entry instead.
> 
> (since rsyslog git commit de77494415ae8c169949d13ed0df0af3b1949b54)
> 
> Signed-off-by: Jiri Jaburek <jjaburek@redhat.com>
> ---
>  testcases/kernel/syscalls/syslog/syslog01 | 15 +++++++++++----
>  testcases/kernel/syscalls/syslog/syslog02 | 16 +++++++++++-----
>  testcases/kernel/syscalls/syslog/syslog09 | 15 +++++++++++----
>  3 files changed, 33 insertions(+), 13 deletions(-)
> 
> diff --git a/testcases/kernel/syscalls/syslog/syslog01
> b/testcases/kernel/syscalls/syslog/syslog01
> index b7bcd9e..b9c7c7f 100755
> --- a/testcases/kernel/syscalls/syslog/syslog01
> +++ b/testcases/kernel/syscalls/syslog/syslog01
> @@ -67,10 +67,17 @@ syslog_case1()
>  	restart_syslog_daemon
>  
>  	# check if $MAILLOG script exists
> -	if [ "$CONFIG_FILE" != "/etc/syslog-ng/syslog-ng.conf" -a ! -e $MAILLOG ];
> then
> -		tst_resm TBROK "$MAILLOG no such log file"
> -		cleanup 1
> -	fi
> +	case "$CONFIG_FILE" in
> +	/etc/syslog-ng/syslog-ng.conf|/etc/rsyslog.conf)
> +		# syslog-ng and rsyslog don't create empty log files
> +		;;
> +	*)
> +		if [ ! -e $MAILLOG ]; then
> +			tst_resm TBROK "$MAILLOG no such log file"
> +			cleanup 1
> +		fi
> +		;;
> +	esac
>  
>  	# Grepping pattern has to be changed whenever the executable name
>  	# changes, ex: syslogtst executable.
> diff --git a/testcases/kernel/syscalls/syslog/syslog02
> b/testcases/kernel/syscalls/syslog/syslog02
> index a416344..c863daa 100755
> --- a/testcases/kernel/syscalls/syslog/syslog02
> +++ b/testcases/kernel/syscalls/syslog/syslog02
> @@ -68,11 +68,17 @@ syslog_case2()
>  		# Grepping pattern is as follows:
>  		# syslogtst: mail $level test.
>  		# check if $MAILLOG script exists
> -		if [ "$CONFIG_FILE" != "/etc/syslog-ng/syslog-ng.conf" -a ! -e $MAILLOG ];
> then
> -			tst_resm TBROK "$MAILLOG no such log file"
> -			cleanup 1
> -		fi
> -
> +		case "$CONFIG_FILE" in
> +		/etc/syslog-ng/syslog-ng.conf|/etc/rsyslog.conf)
> +			# syslog-ng and rsyslog don't create empty log files
> +			;;
> +		*)
> +			if [ ! -e $MAILLOG ]; then
> +				tst_resm TBROK "$MAILLOG no such log file"
> +				cleanup 1
> +			fi
> +			;;
> +		esac
>  
>  		# Grepping pattern has to be changed whenever the executable name
>  		# changes, ex: syslogtst executable.
> diff --git a/testcases/kernel/syscalls/syslog/syslog09
> b/testcases/kernel/syscalls/syslog/syslog09
> index de06fb1..c488f43 100755
> --- a/testcases/kernel/syscalls/syslog/syslog09
> +++ b/testcases/kernel/syscalls/syslog/syslog09
> @@ -57,10 +57,17 @@ syslog_case9()
>  	restart_syslog_daemon
>  
>  	# check if /var/log/messages script exists
> -	if [ "$CONFIG_FILE" != "/etc/syslog-ng/syslog-ng.conf" -a ! -e
> /var/log/messages ]; then
> -		tst_resm TBROK "/var/log/messages no such log file"
> -		cleanup 1
> -	fi
> +	case "$CONFIG_FILE" in
> +	/etc/syslog-ng/syslog-ng.conf|/etc/rsyslog.conf)
> +		# syslog-ng and rsyslog don't create empty log files
> +		;;
> +	*)
> +		if [ ! -e /var/log/messages ]; then
> +			tst_resm TBROK "/var/log/messages no such log file"
> +			cleanup 1
> +		fi
> +		;;
> +	esac
>  
>  	allow1=`grep -c "syslogtst: error level is logged" /var/log/messages`
>  	donot_allow1=`grep -c "syslogtst: warning level not to be logged"
>  	/var/log/messages`
> --
> 1.8.3.1
> 
> 
> ------------------------------------------------------------------------------
> Time is money. Stop wasting it! Get your web API in 5 minutes.
> www.restlet.com/download
> http://p.sf.net/sfu/restlet
> _______________________________________________
> Ltp-list mailing list
> Ltp-list@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/ltp-list
> 

------------------------------------------------------------------------------
Learn Graph Databases - Download FREE O'Reilly Book
"Graph Databases" is the definitive new guide to graph databases and their 
applications. Written by three acclaimed leaders in the field, 
this first edition is now available. Download your free book today!
http://p.sf.net/sfu/NeoTech
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: [LTP] [PATCH] syslog: rsyslog doesn't create empty log files
  2014-06-05 10:35 ` Jan Stancek
@ 2014-06-05 11:30   ` Jiri Jaburek
  2014-06-05 14:37   ` [LTP] [PATCH v2] " Jiri Jaburek
  1 sibling, 0 replies; 5+ messages in thread
From: Jiri Jaburek @ 2014-06-05 11:30 UTC (permalink / raw)
  To: Jan Stancek; +Cc: ltp-list

On 06/05/2014 12:35 PM, Jan Stancek wrote:
> Hi Jiri,
> 
> I was thinking about removing that check, and checking file existence
> only after test generates some log entry. That would make things simpler
> and we would still know if there is logfile after syslogtst ran:

I was considering that as well, but I went with retaining the old
behavior for other possible implementations of generic syslog (if there
are still any).

> 
> 
> diff --git a/testcases/kernel/syscalls/syslog/syslog01 b/testcases/kernel/syscalls/syslog/syslog01
> index b7bcd9e..2f3aea0 100755
> --- a/testcases/kernel/syscalls/syslog/syslog01
> +++ b/testcases/kernel/syscalls/syslog/syslog01
> @@ -66,12 +66,6 @@ syslog_case1()
>  
>         restart_syslog_daemon
>  
> -       # check if $MAILLOG script exists
> -       if [ "$CONFIG_FILE" != "/etc/syslog-ng/syslog-ng.conf" -a ! -e $MAILLOG ]; then
> -               tst_resm TBROK "$MAILLOG no such log file"
> -               cleanup 1
> -       fi
> -
>         # Grepping pattern has to be changed whenever the executable name
>         # changes, ex: syslogtst executable.
>         # This check is neccessary for syslog-ng because $MAILLOG is
> @@ -87,6 +81,11 @@ syslog_case1()
>  
>                 sleep 2
>  
> +               if [ ! -e $MAILLOG ]; then
> +                       tst_resm TBROK "$MAILLOG no such log file"
> +                       cleanup 1
> +               fi
> +
>                 newvalue1=`grep -c "syslogtst: mail info test" $MAILLOG`
>                 if [ "x$(( $newvalue1 - $oldvalue1 ))" != "x1" ]; then
>                         status_flag=1
> diff --git a/testcases/kernel/syscalls/syslog/syslog02 b/testcases/kernel/syscalls/syslog/syslog02
> index a416344..7a55a84 100755
> --- a/testcases/kernel/syscalls/syslog/syslog02
> +++ b/testcases/kernel/syscalls/syslog/syslog02
> @@ -65,15 +65,6 @@ syslog_case2()
>  
>                 restart_syslog_daemon
>  
> -               # Grepping pattern is as follows:
> -               # syslogtst: mail $level test.
> -               # check if $MAILLOG script exists
> -               if [ "$CONFIG_FILE" != "/etc/syslog-ng/syslog-ng.conf" -a ! -e $MAILLOG ]; then
> -                       tst_resm TBROK "$MAILLOG no such log file"
> -                       cleanup 1
> -               fi
> -
> -
>                 # Grepping pattern has to be changed whenever the executable name
>                 # changes, ex: syslogtst executable.
>                 # This check is neccessary for syslog-ng because $MAILLOG is
> diff --git a/testcases/kernel/syscalls/syslog/syslog09 b/testcases/kernel/syscalls/syslog/syslog09
> index de06fb1..9cfafa8 100755
> --- a/testcases/kernel/syscalls/syslog/syslog09
> +++ b/testcases/kernel/syscalls/syslog/syslog09
> @@ -56,15 +56,14 @@ syslog_case9()
>  
>         restart_syslog_daemon
>  
> -       # check if /var/log/messages script exists
> -       if [ "$CONFIG_FILE" != "/etc/syslog-ng/syslog-ng.conf" -a ! -e /var/log/messages ]; then
> -               tst_resm TBROK "/var/log/messages no such log file"
> -               cleanup 1
> +       if [ -e /var/log/messages ]; then
> +               allow1=`grep -c "syslogtst: error level is logged" /var/log/messages`
> +               donot_allow1=`grep -c "syslogtst: warning level not to be logged" /var/log/messages`
> +       else
> +               allow1=0
> +               donot_allow1=0
>         fi
>  
> -       allow1=`grep -c "syslogtst: error level is logged" /var/log/messages`
> -       donot_allow1=`grep -c "syslogtst: warning level not to be logged" /var/log/messages`
> -
>         if ! syslogtst 9 2>/dev/null; then
>                 cleanup 1
>         fi
> 
> What do you think?

Looks good to me.

Jiri


------------------------------------------------------------------------------
Learn Graph Databases - Download FREE O'Reilly Book
"Graph Databases" is the definitive new guide to graph databases and their 
applications. Written by three acclaimed leaders in the field, 
this first edition is now available. Download your free book today!
http://p.sf.net/sfu/NeoTech
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [LTP] [PATCH v2] syslog: rsyslog doesn't create empty log files
  2014-06-05 10:35 ` Jan Stancek
  2014-06-05 11:30   ` Jiri Jaburek
@ 2014-06-05 14:37   ` Jiri Jaburek
  2014-06-13 11:35     ` Jan Stancek
  1 sibling, 1 reply; 5+ messages in thread
From: Jiri Jaburek @ 2014-06-05 14:37 UTC (permalink / raw)
  To: ltp-list

From: Jan Stancek <jstancek@redhat.com>

Newer versions of rsyslog don't create empty log files during startup -
the files are created upon first logged entry instead.
(since rsyslog git commit de77494415ae8c169949d13ed0df0af3b1949b54)

Don't check if log file gets created after service start,
only make sure it exists after test generates a new log entry.

Signed-off-by: Jiri Jaburek <jjaburek@redhat.com>
Signed-off-by: Jan Stancek <jstancek@redhat.com>
---
 testcases/kernel/syscalls/syslog/syslog01 | 11 +++++------
 testcases/kernel/syscalls/syslog/syslog02 |  9 ---------
 testcases/kernel/syscalls/syslog/syslog05 | 10 +++++-----
 testcases/kernel/syscalls/syslog/syslog09 | 13 ++++++-------
 testcases/kernel/syscalls/syslog/syslog10 |  5 -----
 5 files changed, 16 insertions(+), 32 deletions(-)

diff --git a/testcases/kernel/syscalls/syslog/syslog01 b/testcases/kernel/syscalls/syslog/syslog01
index b7bcd9e..2f3aea0 100755
--- a/testcases/kernel/syscalls/syslog/syslog01
+++ b/testcases/kernel/syscalls/syslog/syslog01
@@ -66,12 +66,6 @@ syslog_case1()
 
 	restart_syslog_daemon
 
-	# check if $MAILLOG script exists
-	if [ "$CONFIG_FILE" != "/etc/syslog-ng/syslog-ng.conf" -a ! -e $MAILLOG ]; then
-		tst_resm TBROK "$MAILLOG no such log file"
-		cleanup 1
-	fi
-
 	# Grepping pattern has to be changed whenever the executable name
 	# changes, ex: syslogtst executable.
 	# This check is neccessary for syslog-ng because $MAILLOG is
@@ -87,6 +81,11 @@ syslog_case1()
 
 		sleep 2
 
+		if [ ! -e $MAILLOG ]; then
+			tst_resm TBROK "$MAILLOG no such log file"
+			cleanup 1
+		fi
+
 		newvalue1=`grep -c "syslogtst: mail info test" $MAILLOG`
 		if [ "x$(( $newvalue1 - $oldvalue1 ))" != "x1" ]; then
 			status_flag=1
diff --git a/testcases/kernel/syscalls/syslog/syslog02 b/testcases/kernel/syscalls/syslog/syslog02
index a416344..7a55a84 100755
--- a/testcases/kernel/syscalls/syslog/syslog02
+++ b/testcases/kernel/syscalls/syslog/syslog02
@@ -65,15 +65,6 @@ syslog_case2()
 
 		restart_syslog_daemon
 
-		# Grepping pattern is as follows:
-		# syslogtst: mail $level test.
-		# check if $MAILLOG script exists
-		if [ "$CONFIG_FILE" != "/etc/syslog-ng/syslog-ng.conf" -a ! -e $MAILLOG ]; then
-			tst_resm TBROK "$MAILLOG no such log file"
-			cleanup 1
-		fi
-
-
 		# Grepping pattern has to be changed whenever the executable name
 		# changes, ex: syslogtst executable.
 		# This check is neccessary for syslog-ng because $MAILLOG is
diff --git a/testcases/kernel/syscalls/syslog/syslog05 b/testcases/kernel/syscalls/syslog/syslog05
index 7836993..40dd1fa 100755
--- a/testcases/kernel/syscalls/syslog/syslog05
+++ b/testcases/kernel/syscalls/syslog/syslog05
@@ -59,12 +59,12 @@ syslog_case5()
 	restart_syslog_daemon
 
 	# check if /var/log/messages script exists
-	if [ "$CONFIG_FILE" != "/etc/syslog-ng/syslog-ng.conf" -a ! -e /var/log/messages ]
-	then
-		tst_resm TBROK "/var/log/messages no such log file"
-		cleanup 1
+	if [ -e /var/log/messages ]; then
+		oldvalue=`grep -c "syslogtst: info to console test." /var/log/messages`
+	else
+		oldvalue=0
 	fi
-	oldvalue=`grep -c "syslogtst: info to console test." /var/log/messages`
+
 	# syslogtst does the disabling of /dev/syslog, sends the message and
 	# enables /dev/syslog.
 	if ! syslogtst 5 2>/dev/null; then
diff --git a/testcases/kernel/syscalls/syslog/syslog09 b/testcases/kernel/syscalls/syslog/syslog09
index de06fb1..9cfafa8 100755
--- a/testcases/kernel/syscalls/syslog/syslog09
+++ b/testcases/kernel/syscalls/syslog/syslog09
@@ -56,15 +56,14 @@ syslog_case9()
 
 	restart_syslog_daemon
 
-	# check if /var/log/messages script exists
-	if [ "$CONFIG_FILE" != "/etc/syslog-ng/syslog-ng.conf" -a ! -e /var/log/messages ]; then
-		tst_resm TBROK "/var/log/messages no such log file"
-		cleanup 1
+	if [ -e /var/log/messages ]; then
+		allow1=`grep -c "syslogtst: error level is logged" /var/log/messages`
+		donot_allow1=`grep -c "syslogtst: warning level not to be logged" /var/log/messages`
+	else
+		allow1=0
+		donot_allow1=0
 	fi
 
-	allow1=`grep -c "syslogtst: error level is logged" /var/log/messages`
-	donot_allow1=`grep -c "syslogtst: warning level not to be logged" /var/log/messages`
-
 	if ! syslogtst 9 2>/dev/null; then
 		cleanup 1
 	fi
diff --git a/testcases/kernel/syscalls/syslog/syslog10 b/testcases/kernel/syscalls/syslog/syslog10
index 3b9796d..573ab75 100755
--- a/testcases/kernel/syscalls/syslog/syslog10
+++ b/testcases/kernel/syscalls/syslog/syslog10
@@ -57,11 +57,6 @@ syslog_case10()
 
 	restart_syslog_daemon
 
-	if [ ! -e /var/log/messages ]; then
-		tst_resm TBROK "/var/log/messages no such log file"
-		cleanup 1
-	fi
-
 	if [ -e /var/log/messages ]; then
 		allow1=`grep -c "syslogtst:10 error level is logged" /var/log/messages`
 		donot_allow1=`grep -c "syslogtst:10 warning level not to be logged" /var/log/messages`
-- 
1.8.3.1


------------------------------------------------------------------------------
Learn Graph Databases - Download FREE O'Reilly Book
"Graph Databases" is the definitive new guide to graph databases and their 
applications. Written by three acclaimed leaders in the field, 
this first edition is now available. Download your free book today!
http://p.sf.net/sfu/NeoTech
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: [LTP] [PATCH v2] syslog: rsyslog doesn't create empty log files
  2014-06-05 14:37   ` [LTP] [PATCH v2] " Jiri Jaburek
@ 2014-06-13 11:35     ` Jan Stancek
  0 siblings, 0 replies; 5+ messages in thread
From: Jan Stancek @ 2014-06-13 11:35 UTC (permalink / raw)
  To: Jiri Jaburek; +Cc: ltp-list



----- Original Message -----
> From: "Jiri Jaburek" <jjaburek@redhat.com>
> To: ltp-list@lists.sourceforge.net
> Sent: Thursday, 5 June, 2014 4:37:09 PM
> Subject: [LTP] [PATCH v2] syslog: rsyslog doesn't create empty log files
> 
> From: Jan Stancek <jstancek@redhat.com>
> 
> Newer versions of rsyslog don't create empty log files during startup -
> the files are created upon first logged entry instead.
> (since rsyslog git commit de77494415ae8c169949d13ed0df0af3b1949b54)
> 
> Don't check if log file gets created after service start,
> only make sure it exists after test generates a new log entry.
> 
> Signed-off-by: Jiri Jaburek <jjaburek@redhat.com>
> Signed-off-by: Jan Stancek <jstancek@redhat.com>

Thanks Jiri, looks good to me, pushed.

Regards,
Jan

------------------------------------------------------------------------------
HPCC Systems Open Source Big Data Platform from LexisNexis Risk Solutions
Find What Matters Most in Your Big Data with HPCC Systems
Open Source. Fast. Scalable. Simple. Ideal for Dirty Data.
Leverages Graph Analysis for Fast Processing & Easy Data Exploration
http://p.sf.net/sfu/hpccsystems
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2014-06-13 11:35 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-05-28 10:15 [LTP] [PATCH] syslog: rsyslog doesn't create empty log files Jiri Jaburek
2014-06-05 10:35 ` Jan Stancek
2014-06-05 11:30   ` Jiri Jaburek
2014-06-05 14:37   ` [LTP] [PATCH v2] " Jiri Jaburek
2014-06-13 11:35     ` Jan Stancek

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox