From 8c0ba6c8ad7c23e678e1824a7500c12b7702c5e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Rocha=20da=20Silva?= Date: Mon, 1 Jun 2020 16:41:23 +0100 Subject: [PATCH] added wait for servers to be up before starting archgraph fixed bug in mongodb connection establishing --- conf/run.sh | 15 +++++++++++++++ src/Routes/mongo.py | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/conf/run.sh b/conf/run.sh index 7fad376f0..250f2414c 100755 --- a/conf/run.sh +++ b/conf/run.sh @@ -56,24 +56,39 @@ cd "$ROOT_DIR" if [[ "$NEO4J_HOST" != "" ]]; then echo "Neo4j Server Host: $NEO4J_HOST" +else + NEO4J_HOST="127.0.0.1" fi if [[ "$NEO4J_PORT" != "" ]]; then echo "Neo4j Server Port: $NEO4J_PORT" +else + NEO4J_PORT="7687" fi if [[ "$MONGODB_HOST" != "" ]]; then echo "MongoDB Server Host: $MONGODB_HOST" +else + MONGODB_HOST="127.0.0.1" fi if [[ "$MONGODB_PORT" != "" ]]; then echo "MongoDB Server Port: $MONGODB_PORT" +else + MONGODB_PORT="27017" fi if [[ "$CUSTOM_HOST_FOR_SERVER_BIND" != "" ]]; then echo "Flask Server binding to host with address $CUSTOM_HOST_FOR_SERVER_BIND" fi +## wait for servers to be active before running the application + +./conf/wait-for-it.sh "$MONGODB_HOST:$MONGODB_PORT" --timeout=60 & +./conf/wait-for-it.sh "$NEO4J_HOST:$NEO4J_PORT" --timeout=60 + +wait + python "$ROOT_DIR/src/Routes/routes.py" & SERVER_PID=$! cd "$ROOT_DIR/frontend" || ( echo "folder missing " && exit 1 ) diff --git a/src/Routes/mongo.py b/src/Routes/mongo.py index 79a34694f..a19f2d947 100644 --- a/src/Routes/mongo.py +++ b/src/Routes/mongo.py @@ -10,7 +10,7 @@ client = MongoClient( host=EnvVarManager.get_from_env_or_return_default("MONGODB_HOST", "localhost"), - port=EnvVarManager.get_from_env_or_return_default("MONGODB_PORT", "27017"), + port=int(EnvVarManager.get_from_env_or_return_default("MONGODB_PORT", "27017")), ) db = client.mydatabase date_now = datetime.now().strftime("%Y-%m-%d, %H:%M:%S")