Re: [LTP] [PATCH v3] syslog/syslog-lib.sh: support systemd journal

[Jan Stancek <jstancek@redhat.com>]

----- Original Message -----
> From: "Jeffrey Bastian" <jbastian@redhat.com>
> To: ltp-list@lists.sourceforge.net
> Sent: Friday, 10 July, 2015 12:16:12 AM
> Subject: Re: [LTP] [PATCH v3] syslog/syslog-lib.sh: support systemd journal
> 
> rsyslog needs to use the imjournal module to communicate with
> systemd-journald instead of imuxsock.  Check the system's
> /etc/rsyslog.conf to see if LTP should use imjournal or imuxsock
> 
> Signed-off-by: Jeffrey Bastian <jbastian@redhat.com>

Reviewed-by: Jan Stancek <jstancek@redhat.com>

Looks good to me. I tried this patch with systemd-208 and systemd-219 with
default journald config, the results were as expected with no duplicate messages.

I also tried reversing imuxsock/imjournal to be the opposite of the default
rsyslog config, which worked too. As noted before, ForwardToSyslog=yes
was required for systemd-219 when using imuxsock as that is no longer turned
on by default. This should be of no concern, since we always try to construct
rsyslog config which mimics distro default.

Regards,
Jan

> ---
>  testcases/kernel/syscalls/syslog/syslog-lib.sh | 12 ++++++++++--
>  1 file changed, 10 insertions(+), 2 deletions(-)
> 
> diff --git a/testcases/kernel/syscalls/syslog/syslog-lib.sh
> b/testcases/kernel/syscalls/syslog/syslog-lib.sh
> index ef33517aa92b..e166d3a45261 100755
> --- a/testcases/kernel/syscalls/syslog/syslog-lib.sh
> +++ b/testcases/kernel/syscalls/syslog/syslog-lib.sh
> @@ -71,12 +71,20 @@ setup()
>  		CONFIG_FILE="/etc/syslog-ng/syslog-ng.conf"
>  	elif [ "$SYSLOG_DAEMON" = "rsyslog" ]; then
>  		CONFIG_FILE="/etc/rsyslog.conf"
> -		log_socket=$(grep -ho "^\$SystemLogSocketName .*" -r /etc/rsyslog.conf
> /etc/rsyslog.d/ | head -1)
> -		RSYSLOG_CONFIG=$(cat <<EOF
> +		if grep -q -r '^\$ModLoad[[:space:]]*imjournal' /etc/rsyslog.conf
> /etc/rsyslog.d/ ; then
> +			systemd_journal=$(grep -Ehoi "^[^#].*(imjournal|workdirectory).*" -r
> /etc/rsyslog.conf /etc/rsyslog.d/)
> +			RSYSLOG_CONFIG=$(cat <<EOF
> +$systemd_journal
> +EOF
> +)
> +		else
> +			log_socket=$(grep -ho "^\$SystemLogSocketName .*" -r /etc/rsyslog.conf
> /etc/rsyslog.d/ | head -1)
> +			RSYSLOG_CONFIG=$(cat <<EOF
>  \$ModLoad imuxsock.so
>  $log_socket
>  EOF
>  )
> +		fi
>  	else
>  		tst_resm TBROK "Couldn't find syslogd, syslog-ng or rsyslogd"
>  		cleanup 1
> --
> 1.9.4
> 
> ------------------------------------------------------------------------------
> Don't Limit Your Business. Reach for the Cloud.
> GigeNET's Cloud Solutions provide you with the tools and support that
> you need to offload your IT needs and focus on growing your business.
> Configured For All Businesses. Start Your Cloud Today.
> https://www.gigenetcloud.com/
> _______________________________________________
> Ltp-list mailing list
> Ltp-list@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/ltp-list
> 

------------------------------------------------------------------------------
Don't Limit Your Business. Reach for the Cloud.
GigeNET's Cloud Solutions provide you with the tools and support that
you need to offload your IT needs and focus on growing your business.
Configured For All Businesses. Start Your Cloud Today.
https://www.gigenetcloud.com/
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list