18 Commits

Author SHA1 Message Date
f8feb40723 minor
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
2020-03-30 17:00:59 +02:00
0c18cf9bf1 message
All checks were successful
continuous-integration/drone/push Build is passing
2020-03-30 16:56:29 +02:00
68e2eaffcb message
All checks were successful
continuous-integration/drone/push Build is passing
2020-03-30 16:52:15 +02:00
3c8229238c jsonify
All checks were successful
continuous-integration/drone/push Build is passing
2020-03-30 16:37:12 +02:00
0c3161ef03 204
All checks were successful
continuous-integration/drone/push Build is passing
2020-03-30 16:36:33 +02:00
244b779107 return 200
All checks were successful
continuous-integration/drone/push Build is passing
2020-03-30 16:35:54 +02:00
b04d0d60d0 consumer and log views
All checks were successful
continuous-integration/drone/push Build is passing
2020-03-30 16:32:33 +02:00
735aba20df Merge pull request 'Implemented sync view' (#1) from dev-sync into dev
All checks were successful
continuous-integration/drone/push Build is passing
2020-03-29 18:14:13 +02:00
6f3ef28fb5 Implemented sync view
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
2020-03-29 18:12:16 +02:00
c7c7971253 Updated drone config
All checks were successful
continuous-integration/drone/push Build is passing
2020-03-29 17:15:02 +02:00
9c046b63d9 Created app skeleton
All checks were successful
continuous-integration/drone/push Build is passing
2020-03-29 17:08:53 +02:00
f192459855 flask
All checks were successful
continuous-integration/drone/push Build is passing
2020-03-29 16:08:14 +02:00
bb25397fe6 sorry
All checks were successful
continuous-integration/drone/push Build is passing
2020-03-29 15:24:19 +02:00
97fa82d90e added messagesner class
All checks were successful
continuous-integration/drone/push Build is passing
2020-03-29 15:06:41 +02:00
cef93181fd fix dockerfile
All checks were successful
continuous-integration/drone/push Build is passing
2020-03-29 13:35:19 +02:00
0dbe372777 update sentry url
All checks were successful
continuous-integration/drone/push Build is passing
2020-03-29 12:46:22 +02:00
1647fe4ddb add startup python file
All checks were successful
continuous-integration/drone/push Build is passing
2020-03-29 12:45:16 +02:00
ee5b481ac0 Update '.drone.yml'
All checks were successful
continuous-integration/drone/push Build is passing
2020-03-27 18:47:00 +01:00
9 changed files with 115 additions and 9 deletions

View File

@ -25,10 +25,20 @@ steps:
from_secret: DOCKER_PASSWORD
commands:
- echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
- docker build -t="$DOCKER_USERNAME/consumer" .
- docker build -t="$DOCKER_USERNAME/consumer:$DRONE_BUILD_NUMBER" .
- docker push "$DOCKER_USERNAME/consumer"
- docker push "$DOCKER_USERNAME/consumer:$DRONE_BUILD_NUMBER"
- docker build -t="$DOCKER_USERNAME/consumer_api" .
- docker build -t="$DOCKER_USERNAME/consumer_api:$DRONE_BUILD_NUMBER" .
- docker push "$DOCKER_USERNAME/consumer_api"
- docker push "$DOCKER_USERNAME/consumer_api:$DRONE_BUILD_NUMBER"
- name: slack
image: plugins/slack
settings:
webhook:
from_secret: slack_webhook
channel: alerts-ci
icon_url: https://cloudcdn.tormakristof.eu/static/drone.svg
when:
status: [ failure ]
services:
- name: docker

View File

@ -1,9 +1,13 @@
FROM python:3
FROM python:3.8-slim
WORKDIR /app
ADD consumer_api requirements.txt /consumer_api/
WORKDIR /consumer_api/
COPY . ./
ENV PIP_NO_CACHE_DIR=true
ENV TZ Europe/Budapest
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
RUN pip3 install --no-cache-dir -r requirements.txt
RUN pip3 install -r requirements.txt
CMD ["python3" "app.py"]
EXPOSE 8000
CMD ["gunicorn", "-b", "0.0.0.0:8000", "app:app"]

29
consumer_api/app.py Normal file
View File

@ -0,0 +1,29 @@
#!/usr/bin/env python3
import sentry_sdk
from flask import Flask
import os
from db import redis_client
from views import ConsumersView, LogView, SyncView
"""
Main Flask RESTful API
"""
__author__ = "@tormakris"
__copyright__ = "Copyright 2020, GoldenPogácsa Team"
__module_name__ = "app"
__version__text__ = "1"
sentry_sdk.init("https://0a106e104e114bc9a3fa47f9cb0db2f4@sentry.kmlabz.com/10")
app = Flask(__name__)
app.config['REDIS_URL'] = os.environ['REDIS_URL']
app.config['LOCAL_UUID'] = os.environ['LOCAL_UUID']
redis_client.init_app(app)
for view in [ConsumersView, LogView, SyncView]:
view.register(app, trailing_slash=False)
if __name__ == "__main__":
app.run(debug=True)

3
consumer_api/db.py Normal file
View File

@ -0,0 +1,3 @@
from flask_redis import FlaskRedis
redis_client = FlaskRedis()

View File

@ -0,0 +1,3 @@
from .consumers_view import ConsumersView
from .log_view import LogView
from .sync_view import SyncView

View File

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

View File

@ -0,0 +1,9 @@
from flask import request, current_app, Response
from flask_classful import FlaskView
class LogView(FlaskView):
def post(self):
current_app.logger.info(f"New message: {request.json['message']}")
return Response(status = 204)

View File

@ -0,0 +1,32 @@
import json
from flask import request, current_app, jsonify
from flask_classful import FlaskView
from db import redis_client # ez nagyon otvar
class SyncView(FlaskView):
def post(self):
remote_uuid = request.json['uuid']
remote_ip = request.remote_addr
consumer_list = json.loads((redis_client.get("consumer_list") or b"{}").decode('utf-8'))
# Log something about it
if remote_uuid not in consumer_list.keys():
current_app.logger.info(f"New consumer registered (unknown UUID): {remote_uuid} at {remote_ip}")
else: # known
if consumer_list[remote_uuid]['ip'] != remote_ip:
current_app.logger.info(f"Address of consumer {remote_uuid} changed to {remote_ip}")
consumer_list.update(
{remote_uuid: {"ip": remote_ip}}
)
redis_client.set("consumer_list", json.dumps(consumer_list).encode('utf-8'))
response = {
"uuid": current_app.config['LOCAL_UUID']
}
return jsonify(response)

View File

@ -1 +1,5 @@
sentry_sdk
flask
flask-redis
flask-classful
gunicorn