5 Commits

Author SHA1 Message Date
2376c1355d Merge branch 'dev' of https://git.kmlabz.com/GoldenPogacsa/consumer-api into dev
All checks were successful
continuous-integration/drone/push Build is passing
2020-04-01 01:51:52 +02:00
93beb10c49 dev
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
2020-04-01 00:31:13 +02:00
269c08e5de port 80
All checks were successful
continuous-integration/drone/push Build is passing
2020-04-01 00:28:04 +02:00
19a74de675 port 80
All checks were successful
continuous-integration/drone/push Build is passing
2020-04-01 00:10:48 +02:00
5585574eac Merge pull request 'dev-fabian' (#2) from dev-fabian into dev
All checks were successful
continuous-integration/drone/push Build is passing
2020-03-30 17:18:53 +02:00
2 changed files with 4 additions and 3 deletions

View File

@ -9,5 +9,5 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
RUN pip3 install -r requirements.txt RUN pip3 install -r requirements.txt
EXPOSE 8000 EXPOSE 80
CMD ["gunicorn", "-b", "0.0.0.0:8000", "app:app"] CMD ["gunicorn", "-b", "0.0.0.0:80", "app:app"]

View File

@ -1,7 +1,7 @@
import json import json
from db import redis_client from db import redis_client
from flask import jsonify from flask import jsonify, current_app
from flask_classful import FlaskView from flask_classful import FlaskView
@ -9,4 +9,5 @@ class ConsumersView(FlaskView):
def get(self): def get(self):
consumer_list = json.loads((redis_client.get("consumer_list") or b"{}").decode('utf-8')) consumer_list = json.loads((redis_client.get("consumer_list") or b"{}").decode('utf-8'))
current_app.logger.warning(jsonify([v['ip'] for k, v in consumer_list.items()]))
return jsonify([v['ip'] for k, v in consumer_list.items()]) return jsonify([v['ip'] for k, v in consumer_list.items()])