X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=example%2Fdiameter%2Flauncher%2Fdeployments%2Fst-client%2FcheckStatus.sh;h=3106b8630c7713652eaa3ea61d3509784d408d15;hb=61f81319bb14f08094488e8a2478ff4e0d6d661a;hp=ec658cb7bb222ec6ffd0cb0e0736abc4c5531ab6;hpb=e08f7cf02151389d0b871029ba0fba177157bb8d;p=anna.git

diff --git a/example/diameter/launcher/deployments/st-client/checkStatus.sh b/example/diameter/launcher/deployments/st-client/checkStatus.sh
index ec658cb..3106b86 100755
--- a/example/diameter/launcher/deployments/st-client/checkStatus.sh
+++ b/example/diameter/launcher/deployments/st-client/checkStatus.sh
@@ -4,10 +4,19 @@ ADML_CONNECTIONS=`cat .st_conf_adml_connections 2>/dev/null`
 ADML_INSTANCES=`cat .st_conf_adml_instances 2>/dev/null`
 RESULT_CODE=0
 
+cd $(dirname $0)
+if [ -z "$ADML_CONNECTIONS" -o -z "$ADML_INSTANCES" ]
+then
+  echo
+  echo "Run './configure.sh' first !"
+  echo
+  exit 3
+fi
+
 echo -n "Checking instances ... "
-ADML_INSTANCES_ALIVE=$(pgrep ADML- | wc -l)
+ADML_INSTANCES_ALIVE=$(pgrep "ADML-[0-9]" | wc -l)
 echo -n "$ADML_INSTANCES_ALIVE instances alive"
-if [ $ADML_INSTANCES_ALIVE -ne $ADML_INSTANCES ]
+if [ $ADML_INSTANCES_ALIVE -lt $ADML_INSTANCES ]
 then
   echo " ! (expected $ADML_INSTANCES configured)"
   RESULT_CODE=1
@@ -15,10 +24,11 @@ else
   echo
 fi
 
+cmd="netstat -a | grep :diameter | grep ESTABLISHED | wc -l"
 echo -n "Checking connections ... "
-ADML_CONNECTIONS_ALIVE=$(netstat -a | grep :diameter | grep ESTABLISHED | wc -l)
+ADML_CONNECTIONS_ALIVE=$(eval $cmd)
 ADML_TOTAL_CONNECTIONS=$((ADML_CONNECTIONS*ADML_INSTANCES))
-echo -n "$ADML_CONNECTIONS_ALIVE connections established"
+echo -n "$ADML_CONNECTIONS_ALIVE connections established (using '$cmd')"
 if [ $ADML_CONNECTIONS_ALIVE -ne $ADML_TOTAL_CONNECTIONS ]
 then
   echo " ! (expected $ADML_TOTAL_CONNECTIONS configured)"