Skip to content

Commit

Permalink
Dockerized Full Application(#45, #46) and Fixed UI Issues for #31, #32
Browse files Browse the repository at this point in the history
  • Loading branch information
suyashporedi committed Mar 10, 2020
1 parent 135a9b7 commit 01852fb
Show file tree
Hide file tree
Showing 20 changed files with 1,044 additions and 36 deletions.
3 changes: 2 additions & 1 deletion Frontend/src/core/Session.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class Session extends Component {
const token = isAuthenticated().token;
const id = isAuthenticated().user._id;

read(userId).then(data => {
read(userId,token).then(data => {
if (data.error) {
this.setState({ redirectToSignin: true });
} else {
Expand All @@ -37,6 +37,7 @@ class Session extends Component {
if (data.error) {
console.log(data.error);
} else {
console.log(data);
this.setState({ session_data: data });
}
});
Expand Down
2 changes: 1 addition & 1 deletion Usermanagement_API_Gateway/Backend/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ mongoose.connect(
mongoose.connection.on('error', err => {
console.log(`DB connection error: ${err.message}`)
});
receiveMsg();
// receiveMsg();
// bring in routes
const authRoutes = require('./routes/auth');
const userRoutes = require('./routes/user');
Expand Down
75 changes: 68 additions & 7 deletions Usermanagement_API_Gateway/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,13 @@ version: '3'
# networks:
# app-connect:
# driver : bridge

# networks:
# session-service-network:
services:
ui :
build : ../Frontend/.
ports:
- "0.0.0.0:3000:3000"
rabbitmq:
image: rabbitmq:management
environment:
Expand Down Expand Up @@ -37,10 +42,66 @@ services:
- rabbitmq
# networks:
# - app-connect
# frontend :
# build : ../Frontend/.
# ports:
# - "0.0.0.0:3000:3000"



datamodel :
build : ../datamodelling/.
environment:
- HOSTNAMERABBIT=rabbitmq
depends_on:
- rabbitmq
- postgres
links:
- rabbitmq
dataretrieval:
build : ../dataretrieval/.
environment:
- HOSTNAMERABBIT=rabbitmq
depends_on:
- rabbitmq
- postgres
links:
- rabbitmq
dataanalysis:
build : ../dataanalysis/.
environment:
- HOSTNAMERABBIT=rabbitmq
depends_on:
- rabbitmq
- postgres
links:
- rabbitmq
sessionservice:
build : ../db-service/.
ports:
- "0.0.0.0:8300:8300"
# networks:
# - session-service-network
depends_on:
- mysqldb
mysqldb:
image: mysql:8
ports:
- '3306:3306'
# networks:
# - session-service-network
environment:
- MYSQL_ROOT_PASSWORD=IUB@cs123
- MYSQL_DATABASE=test
postgres:
image : postgres:11
volumes:
- ../postgresql:/docker-entrypoint-initdb.d
environment:
- POSTGRES_MULTIPLE_DATABASES=dataretrieval_db,datamodelling_db,dataresult_db
- POSTGRES_USER=postgres
- POSTGRES_PASSWORD=postgres
# volumes:
# - ../docker-postgresql-multiple-databases:/docker-entrypoint-initdb.d
# environment:
# - POSTGRES_USER=postgres
# - POSTGRES_PASSWORD=postgres
# # - POSTGRES_MULTIPLE_DATABASES=dataretrieval_db,datamodelling_db,dataresult_db
# - POSTGRES_DB=dataretrieval_db
# # - POSTGRES_DB=datamodelling_db
# # - POSTGRES_DB=dataresult_db

4 changes: 2 additions & 2 deletions dataanalysis/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ FROM python:3

RUN mkdir dataanalysis
COPY . dataanalysis
WORKDIR dataanalysis
WORKDIR /dataanalysis

RUN pip install --upgrade pip
RUN pip install -r requirements.txt


CMD python dataanalysis.py
CMD ["./wait-for-it.sh" , "rabbitmq:5672" , "--strict" , "--timeout=30" , "--" , "python3", "dataanalysis.py"]
10 changes: 6 additions & 4 deletions dataanalysis/dataanalysis.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@ def return_api(data, correlationid, userid):
"correlationid": correlationid,
"no_of_files": data
}
connection1 = pika.BlockingConnection(pika.ConnectionParameters('172.17.0.3'))
credentials1 = pika.PlainCredentials(username='guest', password='guest')
connection1 = pika.BlockingConnection(pika.ConnectionParameters(host='rabbitmq',port=5672,credentials=credentials1))
channel1 = connection1.channel()
channel1.queue_declare(queue='service-api', durable=True)
print("servicepai processing connection established")
Expand Down Expand Up @@ -84,7 +85,7 @@ def handle_delivery(channel, method, header, body):

try:
print("connecting to db")
conn = psycopg2.connect("dbname='dataresult_db' user='postgres' host='172.17.0.4' password='postgres'")
conn = psycopg2.connect("dbname='dataresult_db' user='postgres' host='postgres' password='postgres'")
print("connected to db")
cur = conn.cursor()
command = create_tables()
Expand Down Expand Up @@ -127,7 +128,7 @@ def handle_delivery(channel, method, header, body):

return_api(format(len(scans)), correlationid, userid)

conn = psycopg2.connect("dbname='dataresult_db' user='postgres' host='172.17.0.4' password='postgres'")
conn = psycopg2.connect("dbname='dataresult_db' user='postgres' host='postgres' password='postgres'")
cur = conn.cursor()
userid = (data['userid'])
correlationid = (data['correlationid'])
Expand Down Expand Up @@ -157,7 +158,8 @@ def handle_delivery(channel, method, header, body):


# Step #1: Connect to RabbitMQ using the default parameters
parameters = pika.ConnectionParameters(host='172.17.0.3')
credentials = pika.PlainCredentials(username='guest', password='guest')
parameters = pika.ConnectionParameters(host='rabbitmq',port=5672,credentials=credentials)
connection = pika.SelectConnection(parameters, on_open_callback=on_connected)


Expand Down
182 changes: 182 additions & 0 deletions dataanalysis/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
4 changes: 2 additions & 2 deletions datamodelling/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ FROM python:3

RUN mkdir datamodelling
COPY . datamodelling
WORKDIR datamodelling
WORKDIR /datamodelling

RUN pip install --upgrade pip
RUN pip install -r requirements.txt


CMD python datamodelling.py
CMD ["./wait-for-it.sh" , "rabbitmq:5672" , "--strict" , "--timeout=30" , "--" , "python3", "datamodelling.py"]
Loading

0 comments on commit 01852fb

Please sign in to comment.