6 Commits

Author SHA1 Message Date
2c6ab3d96d added saving producer ips to redis
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
2020-04-17 16:21:42 +02:00
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
3 changed files with 27 additions and 4 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
EXPOSE 8000
CMD ["gunicorn", "-b", "0.0.0.0:8000", "app:app"]
EXPOSE 80
CMD ["gunicorn", "-b", "0.0.0.0:80", "app:app"]

View File

@ -1,7 +1,7 @@
import json
from db import redis_client
from flask import jsonify
from flask import jsonify, current_app
from flask_classful import FlaskView
@ -9,4 +9,5 @@ class ConsumersView(FlaskView):
def get(self):
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()])

View File

@ -1,9 +1,31 @@
from flask import request, current_app, Response
from flask_classful import FlaskView
from db import redis_client
class LogView(FlaskView):
def post(self):
# Record the IP address of the producer
remote_uuid = request.json['uuid']
remote_ip = request.remote_addr
prod_key = f"producer_{remote_uuid}"
last_known_remote_ip = redis_client.get(prod_key)
if last_known_remote_ip:
last_known_remote_ip = last_known_remote_ip.decode('utf-8')
if not last_known_remote_ip:
current_app.logger.info(f"New producer {remote_uuid} at {remote_ip}")
elif last_known_remote_ip != remote_ip:
current_app.logger.info(f"IP address of producer {remote_uuid} have changed: {last_known_remote_ip} -> {remote_ip}")
# update expirity
redis_client.set(prod_key, remote_ip.encode('utf-8'))
redis_client.expire(prod_key, 240)
# print out message
current_app.logger.info(f"New message: {request.json['message']}")
return Response(status=204)