Improved kill of previous instance of hive sync or hive server.

.gitlab-ci.yaml

@@ -72,7 +72,7 @@ hivemind_sync:
 
   script:
     - pip3 install --user --upgrade pip setuptools
-    - scripts/ci_sync.sh "$HIVEMIND_DB_NAME" "$HIVEMIND_POSTGRESQL_CONNECTION_STRING" "$HIVEMIND_SOURCE_HIVED_URL" $HIVEMIND_MAX_BLOCK
+    - scripts/ci_sync.sh "$HIVEMIND_DB_NAME" "$HIVEMIND_POSTGRESQL_CONNECTION_STRING" "$HIVEMIND_SOURCE_HIVED_URL" $HIVEMIND_MAX_BLOCK $HIVEMIND_HTTP_PORT
 
   artifacts:
     paths:

scripts/ci_start_server.sh

@@ -29,6 +29,12 @@ if [ -f hive_server.pid ]; then
   rm hive_server.pid;
 fi
 
+fuser $HIVEMIND_HTTP_PORT/tcp -k -INT || true
+sleep 5
+
+fuser $HIVEMIND_HTTP_PORT/tcp -k -KILL || true
+sleep 5
+
 ls -l dist/*
 rm -rf ./local-site
 mkdir -p `python3 -m site --user-site`

scripts/ci_stop_server.sh

@@ -6,7 +6,9 @@ set -e
 
 if [ -f $1 ]; then
   PID=`cat $1`;
-  kill -SIGINT $PID;
+  kill -SIGINT $PID || true;
+  sleep 5
+  kill -9 $PID || true;
 else
   echo Specified pid file: $1 does not exists.;
 fi

scripts/ci_sync.sh

@@ -7,6 +7,7 @@ HIVEMIND_DB_NAME=$1
 HIVEMIND_POSTGRESQL_CONNECTION_STRING=$2
 HIVEMIND_SOURCE_HIVED_URL=$3
 HIVEMIND_MAX_BLOCK=$4
+HIVEMIND_HTTP_PORT=$5
 
 PYTHONUSERBASE=./local-site
 
@@ -33,6 +34,12 @@ kill -SIGINT `pgrep -f "$HIVE_NAME server"` || true;
 sleep 5
 kill -9 `pgrep -f "$HIVE_NAME server"` || true;
 
+fuser $HIVEMIND_HTTP_PORT/tcp -k -INT || true
+sleep 5
+
+fuser $HIVEMIND_HTTP_PORT/tcp -k -KILL || true
+sleep 5
+
 ls -l dist/*
 rm -rf ./local-site
 mkdir -p `python3 -m site --user-site`