Improve MaxScale startup and shutdown in NPM tests

The tests are now less violent in how they stop MaxScale. Also the logs
are now removed before a new test run is executed.
This commit is contained in:
Markus Mäkelä
2018-08-10 21:00:07 +03:00
parent 3bbf58ad1f
commit 064ad8fa4f
5 changed files with 8 additions and 23 deletions

View File

@ -8,13 +8,15 @@ maxscaledir=$MAXSCALE_DIR
test -z "$MAXSCALE_DIR" && exit 1
for ((i=0;i<200;i++))
pkill '^maxscale$'
for ((i=0;i<100;i++))
do
pkill '^maxscale$' || break
pgrep '^maxscale$' &> /dev/null || break
sleep 0.1
done
# If it wasn't dead before, now it is
pkill -9 '^maxscale$'
pgrep '^maxscale$' &> /dev/null && pkill -11 '^maxscale$'
exit 0