diff --git a/main.py b/main.py index 376fcd5..8ae7d5b 100644 --- a/main.py +++ b/main.py @@ -1,5 +1,3 @@ -from flask import Flask -from server import app import server from gunicorn.app.base import BaseApplication import os @@ -20,23 +18,21 @@ class GunicornApp(BaseApplication): def load(self): return self.application - - -if __name__ == '__main__': +if __name__ == "__main__": dotenv.load_dotenv() - - workers = os.getenv('WORKERS', 1) - threads = os.getenv('THREADS', 2) + + workers = os.getenv("WORKERS", 1) + threads = os.getenv("THREADS", 2) workers = int(workers) threads = int(threads) options = { - 'bind': '0.0.0.0:5000', - 'workers': workers, - 'threads': threads, + "bind": "0.0.0.0:5000", + "workers": workers, + "threads": threads, } gunicorn_app = GunicornApp(server.app, options) - print(f'Starting server with {workers} workers and {threads} threads', flush=True) + print(f"Starting server with {workers} workers and {threads} threads", flush=True) gunicorn_app.run() diff --git a/server.py b/server.py index 11feea4..f0b75c7 100644 --- a/server.py +++ b/server.py @@ -1,9 +1,6 @@ -from functools import cache -import json from flask import ( Flask, make_response, - redirect, request, jsonify, render_template, @@ -11,7 +8,6 @@ from flask import ( send_file, ) import os -import json import requests from datetime import datetime import dotenv @@ -26,6 +22,7 @@ def find(name, path): if name in files: return os.path.join(root, name) + # Assets routes @app.route("/assets/") def send_assets(path): @@ -74,17 +71,13 @@ def wellknown(path): # region Main routes @app.route("/") def index(): - # Get current time in the format "dd MMM YYYY hh:mm AM/PM" - # current_datetime = datetime.now().strftime("%d %b %Y %I:%M %p") - # return render_template("index.html", datetime=current_datetime) - # Print the IP address of the requester print(f"Request from IP: {request.remote_addr}") # And the headers print(f"Request headers: {request.headers}") - - - # return redirect("https://ya.c.woodburn.au") + # Get current time in the format "dd MMM YYYY hh:mm AM/PM" + current_datetime = datetime.now().strftime("%d %b %Y %I:%M %p") + return render_template("index.html", datetime=current_datetime) @app.route("/") @@ -116,6 +109,7 @@ def catch_all(path: str): api_requests = 0 + @app.route("/api/v1/data", methods=["GET"]) def api_data(): """