Attachment 153250 Details for Bug 197827 – xymon client rc script rewrite

[patch] xymon client rc script rewrite

xymon-client.diff (text/plain), 1.94 KB, created by Mark Felder on 2015-02-20 22:01:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mark Felder

Created: 2015-02-20 22:01:47 UTC

Size: 1.94 KB

patch

obsolete

>Index: files/xymon-client.in
>===================================================================
>--- files/xymon-client.in	(revision 379469)
>+++ files/xymon-client.in	(working copy)
>@@ -16,10 +16,46 @@
> : ${xymon_client_enable:=NO}
> : ${xymon_client_user:=%%XYMONUSER%%}
> 
>-command=%%WWWDIR%%/client/runclient.sh
>-command_args="${xymon_client_flags} ${1}"
>-procname=%%WWWDIR%%/client/bin/xymonlaunch
> pidfile="%%WWWDIR%%/client/logs/clientlaunch.`hostname`.pid"
>-start_precmd="chown -R ${xymon_client_user} %%WWWDIR%%/client/logs"
>+command=%%WWWDIR%%/client/bin/xymonlaunch
>+command_args="--config=%%WWWDIR%%/client/etc/clientlaunch.cfg --log=%%WWWDIR%%/client/logs/clientlaunch.log --pidfile=${pidfile}"
>+start_precmd=xymon_precmd
> 
>+xymon_precmd()
>+{
>+	# Don't actually pass $xymon_client_flags to $command
>+	rc_flags=""
>+
>+	# Ensure permissions of log dir
>+	chown -R ${xymon_client_user} %%WWWDIR%%/client/logs
>+
>+	# Below is pulled almost directly from Xymon's runclient.sh script which we are bypassing due to redundancy
>+
>+	# Default settings for this client
>+	MACHINEDOTS="`uname -n`"                        # This systems hostname
>+	SERVEROSTYPE="`uname -s | tr '[ABCDEFGHIJKLMNOPQRSTUVWXYZ/]' '[abcdefghijklmnopqrstuvwxyz_]'`"  # This systems operating system in lowercase
>+	XYMONOSSCRIPT="xymonclient-$SERVEROSTYPE.sh"
>+	XYMONCLIENTHOME="%%WWWDIR%%/client"
>+
>+	for i in $xymon_client_flags; do
>+		case "$i" in
>+			--hostname=*)
>+				MACHINEDOTS="`echo $i | sed -e 's/--hostname=//'`"
>+				;;
>+			--os=*)
>+				SERVEROSTYPE="`echo $i | sed -e 's/--os=//' | tr '[ABCDEFGHIJKLMNOPQRSTUVWXYZ/]' '[abcdefghijklmnopqrstuvwxyz_]'`"
>+				;;
>+			--class=*)
>+				CONFIGCLASS="`echo $i | sed -e 's/--class=//' | tr '[ABCDEFGHIJKLMNOPQRSTUVWXYZ/]' '[abcdefghijklmnopqrstuvwxyz_]'`"
>+				;;
>+		esac
>+		shift
>+	done
>+
>+	export MACHINEDOTS SERVEROSTYPE XYMONOSSCRIPT XYMONCLIENTHOME CONFIGCLASS
>+
>+	MACHINE="`echo $MACHINEDOTS | sed -e 's/\./,/g'`"
>+	export MACHINE
>+}
>+
> run_rc_command "$1"

Actions: View | Diff

Attachments on bug 197827: 153250