X-Git-Url: https://git.teslayout.com/public/public/public/?p=anna.git;a=blobdiff_plain;f=example%2Fdiameter%2Flauncher%2Fdeployments%2Fst-client%2FcheckStatus.sh;h=7bbdb3bb59a507ddc4c9100bd1109f7866f07b66;hp=ec658cb7bb222ec6ffd0cb0e0736abc4c5531ab6;hb=f6a2bc0692ff9b4eb3cf35b3458acc3b527a5f66;hpb=7ee10b64f4c116460ffef5784eb9ef87d3f2339c

diff --git a/example/diameter/launcher/deployments/st-client/checkStatus.sh b/example/diameter/launcher/deployments/st-client/checkStatus.sh
index ec658cb..7bbdb3b 100755
--- a/example/diameter/launcher/deployments/st-client/checkStatus.sh
+++ b/example/diameter/launcher/deployments/st-client/checkStatus.sh
@@ -4,10 +4,13 @@ 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)
+#[ -z "$ADML_CONNECTIONS" -o -z "$ADML_INSTANCES" ] && { echo "Miss configuration. Run ./configure.sh" ; exit 3 ; }
+
 echo -n "Checking instances ... "
 ADML_INSTANCES_ALIVE=$(pgrep ADML- | 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 +18,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)"