Skip to content

Commit

Permalink
linter format
Browse files Browse the repository at this point in the history
  • Loading branch information
rashtao committed Dec 23, 2019
1 parent 14bff6a commit d00ddb1
Show file tree
Hide file tree
Showing 263 changed files with 16,105 additions and 16,567 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ before_script:
- chmod 777 ./tests/travis/setup_arangodb.sh
- ./tests/travis/setup_arangodb.sh

after_script:
after_script:
- killall -9 arangod_x86_64

install: mvn install -DskipTests=true -Dgpg.skip=true -Dmaven.javadoc.skip=true -B -V

jdk:
Expand Down
36 changes: 17 additions & 19 deletions docker/start_db_cluster.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,14 @@ LOCATION=$(pwd)/$(dirname "$0")

docker network create arangodb --subnet 172.28.0.0/16

echo "Averysecretword" > "$LOCATION"/jwtSecret
docker run --rm -v "$LOCATION"/jwtSecret:/jwtSecret "$1" arangodb auth header --auth.jwt-secret /jwtSecret > "$LOCATION"/jwtHeader
echo "Averysecretword" >"$LOCATION"/jwtSecret
docker run --rm -v "$LOCATION"/jwtSecret:/jwtSecret "$1" arangodb auth header --auth.jwt-secret /jwtSecret >"$LOCATION"/jwtHeader
AUTHORIZATION_HEADER=$(cat "$LOCATION"/jwtHeader)

debug_container() {
running=$(docker inspect -f '{{.State.Running}}' "$1")

if [ "$running" = false ]
then
if [ "$running" = false ]; then
echo "$1 is not running!"
echo "---"
docker logs "$1"
Expand All @@ -32,27 +31,26 @@ debug_container() {

debug() {
for c in agent1 \
agent2 \
agent3 \
dbserver1 \
dbserver2 \
dbserver3 \
coordinator1 \
coordinator2 ; do
debug_container $c
agent2 \
agent3 \
dbserver1 \
dbserver2 \
dbserver3 \
coordinator1 \
coordinator2; do
debug_container $c
done
}

wait_server() {
# shellcheck disable=SC2091
until $(curl --output /dev/null --silent --head --fail -i -H "$AUTHORIZATION_HEADER" "http://$1/_api/version"); do
printf '.'
debug
sleep 1
done
# shellcheck disable=SC2091
until $(curl --output /dev/null --silent --head --fail -i -H "$AUTHORIZATION_HEADER" "http://$1/_api/version"); do
printf '.'
debug
sleep 1
done
}


echo "Starting containers..."

docker run -d -v "$LOCATION"/jwtSecret:/jwtSecret -e ARANGO_LICENSE_KEY="$ARANGO_LICENSE_KEY" --network arangodb --ip 172.28.1.1 --name agent1 "$1" arangodb --cluster.start-dbserver false --cluster.start-coordinator false --auth.jwt-secret /jwtSecret
Expand Down
4 changes: 2 additions & 2 deletions docker/start_db_single.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ echo "waiting for arangodb ..."

# shellcheck disable=SC2091
until $(curl --output /dev/null --silent --head --fail -i -u root:test 'http://localhost:8529/_api/version'); do
printf '.'
sleep 1
printf '.'
sleep 1
done
echo "READY!"
4 changes: 2 additions & 2 deletions docker/start_db_single_ssl.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ echo "waiting for arangodb ..."

# shellcheck disable=SC2091
until $(curl --output /dev/null --silent --head --fail -i --insecure -u root:test 'https://127.0.0.1:8529/_api/version'); do
printf '.'
sleep 1
printf '.'
sleep 1
done
echo "READY!"
726 changes: 416 additions & 310 deletions formatter.xml

Large diffs are not rendered by default.

Loading

0 comments on commit d00ddb1

Please sign in to comment.