diff options
| author | lonkaars <loek@pipeframe.xyz> | 2021-04-26 16:00:04 +0200 |
|---|---|---|
| committer | lonkaars <loek@pipeframe.xyz> | 2021-04-26 16:00:04 +0200 |
| commit | 53705a48f3b5991db229a9bc72de9ffd8fe7c861 (patch) | |
| tree | 738e3a20453662708489ee2e406b4e39e2685ab3 | |
| parent | 3a95ac4ad928fbd49abe070cd9cd4e51e21007fb (diff) | |
use uwsgi
| -rw-r--r-- | api.systemd.conf | 2 | ||||
| -rw-r--r-- | api/db.py | 4 | ||||
| -rw-r--r-- | api/status.py | 6 | ||||
| -rw-r--r-- | api/user/avatar.py | 6 | ||||
| -rw-r--r-- | uwsgi.ini | 16 |
5 files changed, 25 insertions, 9 deletions
diff --git a/api.systemd.conf b/api.systemd.conf index 264eb92..38c45be 100644 --- a/api.systemd.conf +++ b/api.systemd.conf @@ -4,7 +4,7 @@ Description=Connect 4 API [Service] WorkingDirectory={{ connect4_dir }} User={{ connect4_user }} -ExecStart={{ connect4_dir }}/venv/bin/python3 {{ connect4_dir }}/api/main.py +ExecStart={{ connect4_dir }}/venv/bin/uwsgi -H {{ connect4_dir }}/venv {{ connect4_dir }}/uwsgi.ini [Install] WantedBy=multi-user.target @@ -2,13 +2,13 @@ import os import sqlite3 # open database -db_path = os.path.abspath("database/database.db") +db_path = os.path.abspath("../database/database.db") connection = sqlite3.connect(db_path, check_same_thread=False) #! ^^^ Dit is onveilig en goede multithreading support moet nog geïmplementeerd worden # load the sql extension used in social/search connection.enable_load_extension(True) -connection.load_extension("./database/levenshtein.sqlext") +connection.load_extension("../database/levenshtein.sqlext") # sql cursor cursor = connection.cursor() diff --git a/api/status.py b/api/status.py index 623a180..e8ecdf7 100644 --- a/api/status.py +++ b/api/status.py @@ -2,11 +2,11 @@ from flask import Blueprint from db import cursor import json -HEAD = open(".git/HEAD", "r").read().split(" ")[1].strip() -commit = open(".git/" + HEAD, "r").read().strip() +HEAD = open("../.git/HEAD", "r").read().split(" ")[1].strip() +commit = open("../.git/" + HEAD, "r").read().strip() version = { - "number": json.loads(open("package.json", "r").read())["version"], + "number": json.loads(open("../package.json", "r").read())["version"], "commit": commit, "commit_short": commit[0:8] } diff --git a/api/user/avatar.py b/api/user/avatar.py index 3589653..3367c35 100644 --- a/api/user/avatar.py +++ b/api/user/avatar.py @@ -5,7 +5,7 @@ from os.path import exists from codecs import decode import valid -default_avatar = open("database/avatars/default.png", "rb").read() +default_avatar = open("../database/avatars/default.png", "rb").read() avatar = Blueprint('avatar', __name__) @@ -17,7 +17,7 @@ def get_avatar(token_id): if not user_id: return "", 400 if not valid.user_id(user_id): return "", 403 - avatar_path = f"database/avatars/{user_id}.png" + avatar_path = f"../database/avatars/{user_id}.png" avatar = "" if exists(avatar_path): avatar = open(avatar_path, "rb").read() @@ -30,7 +30,7 @@ def get_avatar(token_id): def update_avatar(user_id): if not request.data: return "", 400 - open(f"database/avatars/{user_id}.png", "wb") \ + open(f"../database/avatars/{user_id}.png", "wb") \ .write(decode(request.data, "base64")) return "", 200 diff --git a/uwsgi.ini b/uwsgi.ini new file mode 100644 index 0000000..1a66ca3 --- /dev/null +++ b/uwsgi.ini @@ -0,0 +1,16 @@ +[uwsgi] +chdir=api/ +wsgi-file=main.py +callable=app +http=127.0.0.1:5000 +need-app=true +lazy-apps=true +master=true +processes=1 +threads=1 +single-interpreter=true +die-on-term=true +procname-prefix-spaced=vier op een rij api +vacuum=true +pidfile=demo.pid +worker-reload-mercy=5 |