Skip to content
Snippets Groups Projects
Commit 19338ba8 authored by Patrick Jentsch's avatar Patrick Jentsch
Browse files

Add daemon loop

parent 5427698a
No related branches found
No related tags found
No related merge requests found
...@@ -111,6 +111,10 @@ NOPAQUE_ADMIN= ...@@ -111,6 +111,10 @@ NOPAQUE_ADMIN=
# Swarm nodes # Swarm nodes
# NOPAQUE_DATA_DIR= # NOPAQUE_DATA_DIR=
# CHOOSE ONE: False, True
# DEFAULT: False
# NOPAQUE_DAEMON_ENABLED=
# DEFAULT: 0.0.0.0 # DEFAULT: 0.0.0.0
# NOPAQUE_HOST= # NOPAQUE_HOST=
......
...@@ -17,7 +17,6 @@ RUN apt-get update \ ...@@ -17,7 +17,6 @@ RUN apt-get update \
&& apt-get install --no-install-recommends --yes \ && apt-get install --no-install-recommends --yes \
build-essential \ build-essential \
libpq-dev \ libpq-dev \
wait-for-it \
&& rm -r /var/lib/apt/lists/* && rm -r /var/lib/apt/lists/*
......
...@@ -35,7 +35,7 @@ class Role(db.Model): ...@@ -35,7 +35,7 @@ class Role(db.Model):
# Fields # Fields
default = db.Column(db.Boolean, default=False, index=True) default = db.Column(db.Boolean, default=False, index=True)
name = db.Column(db.String(64), unique=True) name = db.Column(db.String(64), unique=True)
permissions = db.Column(db.BigInteger) permissions = db.Column(db.Integer)
# Relationships # Relationships
users = db.relationship('User', backref='role', lazy='dynamic') users = db.relationship('User', backref='role', lazy='dynamic')
......
#!/bin/bash #!/bin/bash
source venv/bin/activate
while true; do if [[ "${NOPAQUE_DAEMON_ENABLED}" == "True" ]]; then
flask deploy echo "Starting nopaque daemon..."
if [[ "$?" == "0" ]]; then ./nopaque-daemon.sh &
break fi
fi
echo Deploy command failed, retrying in 5 secs... source venv/bin/activate
sleep 5
done
if [[ "$#" -eq 0 ]]; then if [[ "${#}" -eq 0 ]]; then
while true; do
flask deploy
if [[ "${?}" == "0" ]]; then
break
fi
echo Deploy command failed, retrying in 5 secs...
sleep 5
done
python nopaque.py python nopaque.py
elif [[ "$1" == "flask" ]]; then elif [[ "${1}" == "flask" ]]; then
exec ${@:1} exec ${@:1}
else else
echo "$0 [COMMAND]" echo "${0} [COMMAND]"
echo "" echo ""
echo "nopaque startup script" echo "nopaque startup script"
echo "" echo ""
......
#!/bin/bash
source venv/bin/activate
while true; do
flask tasks
sleep 10
done
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment