Implemented stuff

This commit is contained in:
Pünkösd Marcell 2021-12-10 23:04:41 +01:00
parent 9f4504b5b8
commit 3b5621278f
6 changed files with 88 additions and 7 deletions

View File

@ -5,7 +5,7 @@ from flask import Flask
from werkzeug.middleware.proxy_fix import ProxyFix
# import stuff
from utils import register_all_error_handlers, register_health_checks
from utils import register_all_error_handlers, register_health_checks, redis_client
# import views
from views import AssignmentView
@ -34,7 +34,7 @@ app.config.from_object(Config)
app.wsgi_app = ProxyFix(app.wsgi_app, x_proto=1)
# init stuff
redis_client.init_app(app)
# register error handlers

View File

@ -1,6 +1,17 @@
import os
def parse_default_while_not_defined():
envvar = os.environ.get("DEFAULT_WHILE_NOT_DEFINED")
if not envvar:
return None, None
envvar = envvar.split(';', 1)[2:]
return envvar
class Config:
SECRET_KEY = os.environ.get('SECRET_KEY', os.urandom(12))
@ -8,6 +19,8 @@ class Config:
RELEASE_ID = os.environ.get("RELEASE_ID", "test")
RELEASEMODE = os.environ.get("RELEASEMODE", "dev")
REDIS_URL = os.environ.get("REDIS_URL", "redis://localhost:6379/0")
DEFAULT_WHILE_NOT_DEFINED = parse_default_while_not_defined()
INFLUXDB_TIMEOUT = 30
DEVICE_TIMEOUT = int(os.environ.get("DEVICE_TIMEOUT", 120))

View File

@ -2,3 +2,4 @@
from .require_decorators import json_required
from .error_handlers import register_all_error_handlers
from .healthchecks import register_health_checks
from .redis_client import redis_client

View File

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

View File

@ -1,7 +1,71 @@
#!/usr/bin/env python3
from flask import jsonify, request, abort, current_app, Response
from typing import Optional
from flask import jsonify, request, abort, current_app
from utils import json_required, redis_client
from flask_classful import FlaskView
import json
class AssignmentView(FlaskView):
pass
@staticmethod
def _resolve_response(site: Optional[str]) -> dict:
site_url_map = redis_client.get("SITEURLMAP")
if site_url_map:
site_url_map = json.loads(site_url_map.decode('utf-8'))
if not site_url_map:
return {
"site": current_app.config['DEFAULT_WHILE_NOT_DEFINED'][0],
"url": current_app.config['DEFAULT_WHILE_NOT_DEFINED'][1],
"hard_default": True
}
if not site:
return {
"site": current_app.config['DEFAULT_WHILE_NOT_DEFINED'][0],
"url": current_app.config['DEFAULT_WHILE_NOT_DEFINED'][1],
"hard_default": True
}
if site not in site_url_map.keys():
# This should be an internal server error instead
return {
"site": current_app.config['DEFAULT_WHILE_NOT_DEFINED'][0],
"url": current_app.config['DEFAULT_WHILE_NOT_DEFINED'][1],
"hard_default": True
}
return {
"site": site,
"url": site_url_map[site],
"hard_default": False
}
@json_required
def post(self):
device_id = request.json['device_id']
schedule_store_key = f"SCHEDULED:{device_id}"
target_site = redis_client.get(schedule_store_key)
if target_site:
target_site = target_site.decode('utf-8')
if not target_site:
default_target = redis_client.get('DEFAULT:SCHEDULED')
if default_target:
target_site = default_target.decode('utf-8')
redis_client.set(schedule_store_key, default_target)
# Update (or set) TTL
redis_client.expire(
schedule_store_key,
current_app.config['DEVICE_TIMEOUT']
)
return jsonify(self._resolve_response(target_site))

View File

@ -9,7 +9,7 @@ sentry_sdk
flask_minio
py-healthcheck
Flask-InfluxDB~=0.3.3
flask-redis
jaeger-client
Flask-Opentracing