Skip to content

Commit

Permalink
Separated connection strings into host + port combinations
Browse files Browse the repository at this point in the history
added wait-for-it.sh
  • Loading branch information
silvae86 committed Jun 1, 2020
1 parent eaeca75 commit 181ac95
Show file tree
Hide file tree
Showing 9 changed files with 236 additions and 24 deletions.
19 changes: 15 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,20 @@
FROM ubuntu:18.04 as dependencies_ready
FROM ubuntu:18.04 as os_dependencies_ready

RUN apt-get update -qq
RUN apt-get install -y -qq git curl wget build-essential
FROM dependencies_ready
COPY . /archgraph
WORKDIR /archgraph

FROM os_dependencies_ready as libraries_and_modules_installed
COPY ./conf /archgraph_setup/conf
COPY ./requirements.txt /archgraph_setup/requirements.txt
COPY ./frontend/package.json /archgraph_setup/frontend/package.json
WORKDIR /archgraph_setup
RUN ./conf/install.sh

FROM libraries_installed as archgraph_installed
COPY . /archgraph
COPY /archgraph_setup/frontend/node_modules /archgraph/frontend

FROM archgraph_installed as cleanup_complete
RUN rm -rf /archgraph_setup

ENTRYPOINT [ "./conf/run.sh" ]
18 changes: 13 additions & 5 deletions conf/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -54,16 +54,24 @@ fi
echo "Starting archgraph server at $ROOT_DIR"
cd "$ROOT_DIR"

if [[ "$NEO4J_CONNECTION_STRING" != "" ]]; then
echo "Neo4j Server at $NEO4J_CONNECTION_STRING";
if [[ "$NEO4J_HOST" != "" ]]; then
echo "Neo4j Server Host: $NEO4J_HOST"
fi

if [[ "$MONGODB_CONNECTION_STRING" != "" ]]; then
echo "MongoDB Server at $MONGODB_CONNECTION_STRING";
if [[ "$NEO4J_PORT" != "" ]]; then
echo "Neo4j Server Port: $NEO4J_PORT"
fi

if [[ "$MONGODB_HOST" != "" ]]; then
echo "MongoDB Server Host: $MONGODB_HOST"
fi

if [[ "$MONGODB_PORT" != "" ]]; then
echo "MongoDB Server Port: $MONGODB_PORT"
fi

if [[ "$CUSTOM_HOST_FOR_SERVER_BIND" != "" ]]; then
echo "Flask Server binding to host with address $CUSTOM_HOST_FOR_SERVER_BIND";
echo "Flask Server binding to host with address $CUSTOM_HOST_FOR_SERVER_BIND"
fi

python "$ROOT_DIR/src/Routes/routes.py" &
Expand Down
182 changes: 182 additions & 0 deletions conf/wait-for-it.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,182 @@
#!/usr/bin/env bash
# Use this script to test if a given TCP host/port are available

WAITFORIT_cmdname=${0##*/}

echoerr() { if [[ $WAITFORIT_QUIET -ne 1 ]]; then echo "$@" 1>&2; fi }

usage()
{
cat << USAGE >&2
Usage:
$WAITFORIT_cmdname host:port [-s] [-t timeout] [-- command args]
-h HOST | --host=HOST Host or IP under test
-p PORT | --port=PORT TCP port under test
Alternatively, you specify the host and port as host:port
-s | --strict Only execute subcommand if the test succeeds
-q | --quiet Don't output any status messages
-t TIMEOUT | --timeout=TIMEOUT
Timeout in seconds, zero for no timeout
-- COMMAND ARGS Execute command with args after the test finishes
USAGE
exit 1
}

wait_for()
{
if [[ $WAITFORIT_TIMEOUT -gt 0 ]]; then
echoerr "$WAITFORIT_cmdname: waiting $WAITFORIT_TIMEOUT seconds for $WAITFORIT_HOST:$WAITFORIT_PORT"
else
echoerr "$WAITFORIT_cmdname: waiting for $WAITFORIT_HOST:$WAITFORIT_PORT without a timeout"
fi
WAITFORIT_start_ts=$(date +%s)
while :
do
if [[ $WAITFORIT_ISBUSY -eq 1 ]]; then
nc -z $WAITFORIT_HOST $WAITFORIT_PORT
WAITFORIT_result=$?
else
(echo > /dev/tcp/$WAITFORIT_HOST/$WAITFORIT_PORT) >/dev/null 2>&1
WAITFORIT_result=$?
fi
if [[ $WAITFORIT_result -eq 0 ]]; then
WAITFORIT_end_ts=$(date +%s)
echoerr "$WAITFORIT_cmdname: $WAITFORIT_HOST:$WAITFORIT_PORT is available after $((WAITFORIT_end_ts - WAITFORIT_start_ts)) seconds"
break
fi
sleep 1
done
return $WAITFORIT_result
}

wait_for_wrapper()
{
# In order to support SIGINT during timeout: http://unix.stackexchange.com/a/57692
if [[ $WAITFORIT_QUIET -eq 1 ]]; then
timeout $WAITFORIT_BUSYTIMEFLAG $WAITFORIT_TIMEOUT $0 --quiet --child --host=$WAITFORIT_HOST --port=$WAITFORIT_PORT --timeout=$WAITFORIT_TIMEOUT &
else
timeout $WAITFORIT_BUSYTIMEFLAG $WAITFORIT_TIMEOUT $0 --child --host=$WAITFORIT_HOST --port=$WAITFORIT_PORT --timeout=$WAITFORIT_TIMEOUT &
fi
WAITFORIT_PID=$!
trap "kill -INT -$WAITFORIT_PID" INT
wait $WAITFORIT_PID
WAITFORIT_RESULT=$?
if [[ $WAITFORIT_RESULT -ne 0 ]]; then
echoerr "$WAITFORIT_cmdname: timeout occurred after waiting $WAITFORIT_TIMEOUT seconds for $WAITFORIT_HOST:$WAITFORIT_PORT"
fi
return $WAITFORIT_RESULT
}

# process arguments
while [[ $# -gt 0 ]]
do
case "$1" in
*:* )
WAITFORIT_hostport=(${1//:/ })
WAITFORIT_HOST=${WAITFORIT_hostport[0]}
WAITFORIT_PORT=${WAITFORIT_hostport[1]}
shift 1
;;
--child)
WAITFORIT_CHILD=1
shift 1
;;
-q | --quiet)
WAITFORIT_QUIET=1
shift 1
;;
-s | --strict)
WAITFORIT_STRICT=1
shift 1
;;
-h)
WAITFORIT_HOST="$2"
if [[ $WAITFORIT_HOST == "" ]]; then break; fi
shift 2
;;
--host=*)
WAITFORIT_HOST="${1#*=}"
shift 1
;;
-p)
WAITFORIT_PORT="$2"
if [[ $WAITFORIT_PORT == "" ]]; then break; fi
shift 2
;;
--port=*)
WAITFORIT_PORT="${1#*=}"
shift 1
;;
-t)
WAITFORIT_TIMEOUT="$2"
if [[ $WAITFORIT_TIMEOUT == "" ]]; then break; fi
shift 2
;;
--timeout=*)
WAITFORIT_TIMEOUT="${1#*=}"
shift 1
;;
--)
shift
WAITFORIT_CLI=("$@")
break
;;
--help)
usage
;;
*)
echoerr "Unknown argument: $1"
usage
;;
esac
done

if [[ "$WAITFORIT_HOST" == "" || "$WAITFORIT_PORT" == "" ]]; then
echoerr "Error: you need to provide a host and port to test."
usage
fi

WAITFORIT_TIMEOUT=${WAITFORIT_TIMEOUT:-15}
WAITFORIT_STRICT=${WAITFORIT_STRICT:-0}
WAITFORIT_CHILD=${WAITFORIT_CHILD:-0}
WAITFORIT_QUIET=${WAITFORIT_QUIET:-0}

# Check to see if timeout is from busybox?
WAITFORIT_TIMEOUT_PATH=$(type -p timeout)
WAITFORIT_TIMEOUT_PATH=$(realpath $WAITFORIT_TIMEOUT_PATH 2>/dev/null || readlink -f $WAITFORIT_TIMEOUT_PATH)

WAITFORIT_BUSYTIMEFLAG=""
if [[ $WAITFORIT_TIMEOUT_PATH =~ "busybox" ]]; then
WAITFORIT_ISBUSY=1
# Check if busybox timeout uses -t flag
# (recent Alpine versions don't support -t anymore)
if timeout &>/dev/stdout | grep -q -e '-t '; then
WAITFORIT_BUSYTIMEFLAG="-t"
fi
else
WAITFORIT_ISBUSY=0
fi

if [[ $WAITFORIT_CHILD -gt 0 ]]; then
wait_for
WAITFORIT_RESULT=$?
exit $WAITFORIT_RESULT
else
if [[ $WAITFORIT_TIMEOUT -gt 0 ]]; then
wait_for_wrapper
WAITFORIT_RESULT=$?
else
wait_for
WAITFORIT_RESULT=$?
fi
fi

if [[ $WAITFORIT_CLI != "" ]]; then
if [[ $WAITFORIT_RESULT -ne 0 && $WAITFORIT_STRICT -eq 1 ]]; then
echoerr "$WAITFORIT_cmdname: strict mode, refusing to execute subprocess"
exit $WAITFORIT_RESULT
fi
exec "${WAITFORIT_CLI[@]}"
else
exit $WAITFORIT_RESULT
fi
6 changes: 4 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,10 @@ services:
SOURCE_BRANCH: "master"
context: .
environment:
- "NEO4J_CONNECTION_STRING=bolt://neo4j:password@archgraph-neo4j:7687"
- "MONGODB_CONNECTION_STRING=mongodb://root:rootpassword@archgraph-mongodb:27017"
- "NEO4J_HOST=archgraph-neo4j"
- "NEO4J_PORT=7687"
- "MONGODB_HOST=archgraph-mongodb"
- "MONGODB_PORT=27017"
- "CUSTOM_HOST_FOR_SERVER_BIND=0.0.0.0"
- "RUN_IN_PRODUCTION=1"
- "INIT_GRAPH=1"
Expand Down
5 changes: 2 additions & 3 deletions src/GCF/utils/db.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,8 @@

def get_connection():
return Graph(
uri=EnvVarManager.get_from_env_or_return_default(
"NEO4J_CONNECTION_STRING", "bolt://neo4j:password@localhost:7687"
)
host=EnvVarManager.get_from_env_or_return_default("NEO4J_HOST", "127.0.0.1"),
port=EnvVarManager.get_from_env_or_return_default("NEO4J_PORT", "7687"),
)


Expand Down
8 changes: 4 additions & 4 deletions src/Routes/mongo.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@

args = EnvVarManager.parse()

MONGODB_URL = EnvVarManager.get_from_env_or_return_default(
"MONGODB_CONNECTION_STRING", "mongodb://root:rootpassword@localhost:27017"
)

client = MongoClient(MONGODB_URL)
client = MongoClient(
host=EnvVarManager.get_from_env_or_return_default("MONGODB_HOST", "localhost"),
port=EnvVarManager.get_from_env_or_return_default("MONGODB_PORT", "27017"),
)
db = client.mydatabase
date_now = datetime.now().strftime("%Y-%m-%d, %H:%M:%S")

Expand Down
7 changes: 5 additions & 2 deletions src/Routes/routes.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,11 @@ def get_project_root():

import src.Utils.EnvVarManager as EnvVarManager

config.DATABASE_URL = EnvVarManager.get_from_env_or_return_default(
"NEO4J_CONNECTION_STRING", "bolt://neo4j:password@localhost:7687"
config.DATABASE_URL = (
"bolt://neo4j:password@"
+ EnvVarManager.get_from_env_or_return_default("NEO4J_HOST", "127.0.0.1")
+ ":"
+ EnvVarManager.get_from_env_or_return_default("NEO4J_PORT", "27017")
)

from src.Routes.mongo import (
Expand Down
7 changes: 5 additions & 2 deletions test/Unit/test_data_object.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,11 @@

import src.Utils.EnvVarManager as EnvVarManager

config.DATABASE_URL = EnvVarManager.get_from_env_or_return_default(
"NEO4J_CONNECTION_STRING", "bolt://neo4j:password@localhost:7687"
config.DATABASE_URL = (
"bolt://neo4j:password@"
+ EnvVarManager.get_from_env_or_return_default("NEO4J_HOST", "127.0.0.1")
+ ":"
+ EnvVarManager.get_from_env_or_return_default("NEO4J_PORT", "27017")
)
clean_database()

Expand Down
8 changes: 6 additions & 2 deletions test/Unit/test_relations.py
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,13 @@

import src.Utils.EnvVarManager as EnvVarManager

config.DATABASE_URL = EnvVarManager.get_from_env_or_return_default(
"NEO4J_CONNECTION_STRING", "bolt://neo4j:password@localhost:7687"
config.DATABASE_URL = (
"bolt://neo4j:password@"
+ EnvVarManager.get_from_env_or_return_default("NEO4J_HOST", "127.0.0.1")
+ ":"
+ EnvVarManager.get_from_env_or_return_default("NEO4J_PORT", "27017")
)

# ref = list_indexes()
# if ref[0].__len__() != 0:
try:
Expand Down

0 comments on commit 181ac95

Please sign in to comment.