mirror of https://gitee.com/bigwinds/arangodb
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
This commit is contained in:
commit
53f05f04d4
|
@ -1,4 +1,12 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
if [ -z "$XTERM" ] ; then
|
||||||
|
XTERM=x-terminal-emulator
|
||||||
|
fi
|
||||||
|
if [ -z "$XTERMOPTIONS" ] ; then
|
||||||
|
XTERMOPTIONS="--geometry=80x43"
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
if [ ! -d arangod ] || [ ! -d arangosh ] || [ ! -d UnitTests ] ; then
|
if [ ! -d arangod ] || [ ! -d arangosh ] || [ ! -d UnitTests ] ; then
|
||||||
echo Must be started in the main ArangoDB source directory.
|
echo Must be started in the main ArangoDB source directory.
|
||||||
exit 1
|
exit 1
|
||||||
|
@ -18,7 +26,7 @@ echo Number of Coordinators: $NRCOORDINATORS
|
||||||
if [ ! -z "$3" ] ; then
|
if [ ! -z "$3" ] ; then
|
||||||
if [ "$3" == "C" ] ; then
|
if [ "$3" == "C" ] ; then
|
||||||
COORDINATORCONSOLE=1
|
COORDINATORCONSOLE=1
|
||||||
echo Starting one coordinator in xterm with --console
|
echo Starting one coordinator in terminal with --console
|
||||||
elif [ "$3" == "D" ] ; then
|
elif [ "$3" == "D" ] ; then
|
||||||
CLUSTERDEBUGGER=1
|
CLUSTERDEBUGGER=1
|
||||||
echo Running cluster in debugger.
|
echo Running cluster in debugger.
|
||||||
|
@ -30,10 +38,6 @@ fi
|
||||||
|
|
||||||
SECONDARIES="$4"
|
SECONDARIES="$4"
|
||||||
|
|
||||||
if [ -z "$XTERMOPTIONS" ] ; then
|
|
||||||
XTERMOPTIONS="-fa Monospace-14 -bg white -fg black -geometry 80x43"
|
|
||||||
fi
|
|
||||||
|
|
||||||
rm -rf cluster
|
rm -rf cluster
|
||||||
mkdir cluster
|
mkdir cluster
|
||||||
echo Starting agency...
|
echo Starting agency...
|
||||||
|
@ -93,7 +97,7 @@ startTerminal() {
|
||||||
PORT=$2
|
PORT=$2
|
||||||
mkdir cluster/data$PORT
|
mkdir cluster/data$PORT
|
||||||
echo Starting $TYPE on port $PORT
|
echo Starting $TYPE on port $PORT
|
||||||
xterm $XTERMOPTIONS -e build/bin/arangod -c none \
|
$XTERM $XTERMOPTIONS -e build/bin/arangod -c none \
|
||||||
--database.directory cluster/data$PORT \
|
--database.directory cluster/data$PORT \
|
||||||
--cluster.agency-endpoint tcp://127.0.0.1:4001 \
|
--cluster.agency-endpoint tcp://127.0.0.1:4001 \
|
||||||
--cluster.my-address tcp://127.0.0.1:$PORT \
|
--cluster.my-address tcp://127.0.0.1:$PORT \
|
||||||
|
@ -130,7 +134,7 @@ startDebugger() {
|
||||||
--javascript.startup-directory ./js \
|
--javascript.startup-directory ./js \
|
||||||
--javascript.app-path ./js/apps \
|
--javascript.app-path ./js/apps \
|
||||||
--server.authentication false &
|
--server.authentication false &
|
||||||
xterm $XTERMOPTIONS -title "$TYPE $PORT" -e gdb build/bin/arangod -p $! &
|
$XTERM $XTERMOPTIONS -e gdb build/bin/arangod -p $! &
|
||||||
}
|
}
|
||||||
|
|
||||||
startRR() {
|
startRR() {
|
||||||
|
@ -143,7 +147,7 @@ startRR() {
|
||||||
PORT=$2
|
PORT=$2
|
||||||
mkdir cluster/data$PORT
|
mkdir cluster/data$PORT
|
||||||
echo Starting $TYPE on port $PORT with rr tracer
|
echo Starting $TYPE on port $PORT with rr tracer
|
||||||
xterm $XTERMOPTIONS -title "$TYPE $PORT" -e rr build/bin/arangod \
|
$XTERM $XTERMOPTIONS -e rr build/bin/arangod \
|
||||||
-c none \
|
-c none \
|
||||||
--database.directory cluster/data$PORT \
|
--database.directory cluster/data$PORT \
|
||||||
--cluster.agency-endpoint tcp://127.0.0.1:4001 \
|
--cluster.agency-endpoint tcp://127.0.0.1:4001 \
|
||||||
|
|
Loading…
Reference in New Issue