Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

moves -e to XTERMOPTIONS and adds delay (#5297) 

* moves -e to XTERMOPTIONS and adds delay
* add delay only when rr is used
This commit is contained in:
Jan Christoph Uhde 2018-06-01 10:07:59 +02:00 committed by Max Neunhöffer
parent 6fdc811c41
commit 2829b3e77d
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/cluster-run-common.sh
View File

@ -40,7 +40,7 @@ if [ -z "$XTERM" ] ; then
XTERM="x-terminal-emulator" XTERM="x-terminal-emulator"
fi fi
if [ -z "$XTERMOPTIONS" ] ; then if [ -z "$XTERMOPTIONS" ] ; then
XTERMOPTIONS="--geometry=80x43" XTERMOPTIONS=" --geometry=80x43 -e "
fi fi
BUILD="./build" BUILD="./build"
JWT_SECRET="" JWT_SECRET=""

6
scripts/startLocalCluster.sh
View File

@ -111,10 +111,10 @@ fi
if [ ! -z "$INTERACTIVE_MODE" ] ; then if [ ! -z "$INTERACTIVE_MODE" ] ; then
if [ "$INTERACTIVE_MODE" == "C" ] ; then if [ "$INTERACTIVE_MODE" == "C" ] ; then
ARANGOD="${BUILD}/bin/arangod " ARANGOD="${BUILD}/bin/arangod "
CO_ARANGOD="$XTERM $XTERMOPTIONS -e ${BUILD}/bin/arangod --console " CO_ARANGOD="$XTERM $XTERMOPTIONS ${BUILD}/bin/arangod --console "
echo "Starting one coordinator in terminal with --console" echo "Starting one coordinator in terminal with --console"
elif [ "$INTERACTIVE_MODE" == "R" ] ; then elif [ "$INTERACTIVE_MODE" == "R" ] ; then
ARANGOD="$XTERM $XTERMOPTIONS -e rr ${BUILD}/bin/arangod --console " ARANGOD="$XTERM $XTERMOPTIONS rr ${BUILD}/bin/arangod --console "
CO_ARANGOD=$ARANGOD CO_ARANGOD=$ARANGOD
echo Running cluster in rr with --console. echo Running cluster in rr with --console.
fi fi
@ -125,6 +125,7 @@ fi
echo == Starting agency ... echo == Starting agency ...
for aid in `seq 0 $(( $NRAGENTS - 1 ))`; do for aid in `seq 0 $(( $NRAGENTS - 1 ))`; do
[ "$INTERACTIVE_MODE" == "R" ] && sleep 1
port=$(( $AG_BASE + $aid )) port=$(( $AG_BASE + $aid ))
AGENCY_ENDPOINTS+="--cluster.agency-endpoint $TRANSPORT://$ADDRESS:$port " AGENCY_ENDPOINTS+="--cluster.agency-endpoint $TRANSPORT://$ADDRESS:$port "
$ARANGOD \ $ARANGOD \
@ -172,6 +173,7 @@ start() {
PORT=$2 PORT=$2
mkdir -p cluster/data$PORT cluster/apps$PORT mkdir -p cluster/data$PORT cluster/apps$PORT
echo == Starting $TYPE on port $PORT echo == Starting $TYPE on port $PORT
[ "$INTERACTIVE_MODE" == "R" ] && sleep 1
$CMD \ $CMD \
-c none \ -c none \
--database.directory cluster/data$PORT \ --database.directory cluster/data$PORT \