From c4cc874ab9cfeeace220387fbe06d7914e63d615 Mon Sep 17 00:00:00 2001
From: James Kirk <james.kirk@noc.ac.uk>
Date: Thu, 9 Feb 2023 15:37:07 +0000
Subject: [PATCH] refactor: pass in flask host as an arg
---
api.py | 6 +++++-
docker/docker-compose.yaml | 1 +
endpoints/token.py | 3 ---
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/api.py b/api.py
index 909892d..72d91fe 100644
--- a/api.py
+++ b/api.py
@@ -9,6 +9,8 @@ from endpoints.send import Send
from endpoints.token import Token
from models.token import TokenModel
+import os
+
token = TokenModel()
token.setSecret()
@@ -23,5 +25,7 @@ api.add_resource(Send, "/send")
api.add_resource(Notify, "/notify")
api.add_resource(Token, "/token")
+flask_host = os.getenv("FLASK_HOST", "localhost") # Sets to whatever MQ_HOST is, or defaults to localhost
+
if __name__ == "__main__":
- app.run(debug=False, port=8087, host="0.0.0.0")
+ app.run(debug=False, port=8087, host=flask_host)
diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml
index a76b1f7..ec86386 100644
--- a/docker/docker-compose.yaml
+++ b/docker/docker-compose.yaml
@@ -37,6 +37,7 @@ services:
- rabbitmq__local
environment:
- MQ_HOST=rmq
+ - FLASK_HOST=0.0.0.0
volumes:
- ../:/app
command: "api.py"
diff --git a/endpoints/token.py b/endpoints/token.py
index 077ce5a..cbc1ec5 100644
--- a/endpoints/token.py
+++ b/endpoints/token.py
@@ -3,8 +3,6 @@ from flask_restful import Resource, request, abort
from marshmallow import Schema, fields
from models.token import TokenModel
-import os
-
class TokenQuerySchema(Schema):
client_id = fields.Str(required=True)
secret = fields.Str(required=True)
@@ -18,7 +16,6 @@ class Token(Resource):
def __init__(self):
self.schema = TokenQuerySchema()
self.model = TokenModel()
- data_dir = os.getenv("DATA_DIR", "/data")
with open("./data/clients.json", "r") as clients_file:
self.clients = json.load(clients_file)
--
GitLab