From 41f30b17afa82ae7d8e08c579a9f8844acb332e5 Mon Sep 17 00:00:00 2001 From: Peter Viskup Date: Sat, 13 Nov 2010 23:00:21 +0100 Subject: [PATCH] small fix to get ejabberd PID for both 2.0 and 2.1.x ejabberd versions --- plugins/other/ejabberd_ | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/plugins/other/ejabberd_ b/plugins/other/ejabberd_ index 5487b5e1..ec2b3f7d 100755 --- a/plugins/other/ejabberd_ +++ b/plugins/other/ejabberd_ @@ -78,9 +78,11 @@ if [ -z "$vhosts" ]; then fi # get ejabberd PID -#EJPID=$(pidof -s /usr/lib/erlang/erts-5.6.3/bin/beam.smp) -#EJPID=$(ps -ef | awk '/\/bin\/beam.smp/ && !/awk/ {print $2}') -EJPID=$(cat /var/run/ejabberd/ejabberd.pid) +if [[ ${EJVER%\.[0-9]} == 2.1 ]]; then + EJPID=$(cat /var/run/ejabberd/ejabberd.pid) +else + EJPID=$(ps -ef | awk '/\/bin\/beam.smp/ && !/awk/ {print $2}') +fi if [ -z "$vhosts" ]; then echo "No vhosts to sample." > /dev/stderr