hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix startup of MaxScales in NPM tests

Browse Source 
The output was overwritten for each new test.
This commit is contained in:
Markus Mäkelä
2018-08-09 05:35:29 +03:00
parent 38219556b6
commit b69fc4d32c
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
test/start_double_maxscale.sh
View File

@ -13,7 +13,6 @@ test -z "$MAXSCALE_DIR" && exit 1
rm -r $maxscaledir/secondary/lib/maxscale
rm -r $maxscaledir/secondary/cache/maxscale
rm -r $maxscaledir/secondary/run/maxscale
rm -r $maxscaledir/secondary/log/maxscale
test -f /tmp/maxadmin2.sock && rm /tmp/maxadmin2.sock
mkdir -m 0755 -p $maxscaledir/secondary/lib/maxscale
@ -22,7 +21,7 @@ mkdir -m 0755 -p $maxscaledir/secondary/run/maxscale
mkdir -m 0755 -p $maxscaledir/secondary/log/maxscale
# Start MaxScale
$maxscaledir/bin/maxscale -lstdout -df $maxscaledir/maxscale.cnf >& $maxscaledir/maxscale1.output &
$maxscaledir/bin/maxscale -df $maxscaledir/maxscale.cnf &>> $maxscaledir/maxscale1.output &
# Wait for the first MaxScale to start
for ((i=0;i<60;i++))
@ -32,7 +31,7 @@ do
done
# Start a second maxscale
$maxscaledir/bin/maxscale -lstdout -df $maxscaledir/maxscale_secondary.cnf >& $maxscaledir/maxscale2.output &
$maxscaledir/bin/maxscale -df $maxscaledir/maxscale_secondary.cnf &>> $maxscaledir/maxscale2.output &
# Wait for the second MaxScale to start
for ((i=0;i<60;i++))

2
test/start_maxscale.sh
View File

@ -10,7 +10,7 @@ maxscaledir=$MAXSCALE_DIR
test -z "$MAXSCALE_DIR" && exit 1
# Start MaxScale
$maxscaledir/bin/maxscale -df $maxscaledir/maxscale.cnf >& $maxscaledir/maxscale.output &
$maxscaledir/bin/maxscale -df $maxscaledir/maxscale.cnf &>> $maxscaledir/maxscale.output &
pid=$!
# Wait for MaxScale to start