From bdbb85bcb9a255310fa4cb13e6750c2a1fb5da6f Mon Sep 17 00:00:00 2001
From: iFargle <albert@sysctl.io>
Date: Mon, 27 Feb 2023 22:21:51 +0900
Subject: [PATCH] Test

---
 headscale.py |  8 ++++----
 helper.py    |  8 ++++----
 renderer.py  |  8 ++++----
 server.py    | 10 +++++-----
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/headscale.py b/headscale.py
index 0067ca4..88cc136 100644
--- a/headscale.py
+++ b/headscale.py
@@ -1,13 +1,13 @@
 # pylint: disable=wrong-import-order
 
-import requests, json, os
-from server              import app
+import requests, json, os, logger
 from cryptography.fernet import Fernet
 from datetime            import timedelta, date
 from dateutil            import parser
-from flask               import logging
+from flask               import Flask
 
-LOG = logging.create_logger(app)
+app = Flask(__name__, static_url_path="/static")
+LOG = app.logger()
 
 ##################################################################
 # Functions related to HEADSCALE and API KEYS
diff --git a/helper.py b/helper.py
index 322949f..c5a4765 100644
--- a/helper.py
+++ b/helper.py
@@ -1,10 +1,10 @@
 # pylint: disable=wrong-import-order
 
-import os, headscale, requests
-from server import app
-from flask  import logging
+import os, headscale, requests, logger
+from flask import Flask
 
-LOG = logging.create_logger(app)
+app = Flask(__name__, static_url_path="/static")
+LOG = app.logger()
 
 def pretty_print_duration(duration, delta_type=""):
     """ Prints a duration in human-readable formats """
diff --git a/renderer.py b/renderer.py
index 078856a..5b9b79a 100644
--- a/renderer.py
+++ b/renderer.py
@@ -1,14 +1,14 @@
 # pylint: disable=line-too-long, wrong-import-order
 
-import headscale, helper, pytz, os, yaml
-from server             import app
-from flask              import Markup, render_template, logging
+import headscale, helper, pytz, os, yaml, logger
+from flask              import Flask, Markup, render_template
 from datetime           import datetime
 from dateutil           import parser
 from concurrent.futures import ALL_COMPLETED, wait
 from flask_executor     import Executor
 
-LOG = logging.create_logger(app)
+app = Flask(__name__, static_url_path="/static")
+LOG = app.logger()
 executor = Executor(app)
 
 def render_overview():
diff --git a/server.py b/server.py
index beeddad..f571aa7 100644
--- a/server.py
+++ b/server.py
@@ -1,9 +1,9 @@
 # pylint: disable=wrong-import-order
 
-import headscale, helper, json, os, pytz, renderer, secrets, requests
+import headscale, helper, json, os, pytz, renderer, secrets, requests, logger
 from functools                     import wraps
 from datetime                      import datetime
-from flask                         import Flask, Markup, redirect, render_template, request, url_for, logging
+from flask                         import Flask, Markup, redirect, render_template, request, url_for
 from dateutil                      import parser
 from flask_executor                import Executor
 from werkzeug.middleware.proxy_fix import ProxyFix
@@ -30,13 +30,13 @@ dictConfig({
         'formatter': 'default'
     }},
     'root': {
-        'level': 'INFO',
+        'level': LOG_LEVEL,
         'handlers': ['wsgi']
     }
 })
 
-app          = Flask("app", static_url_path="/static")
-LOG          = logging.create_logger(app)
+app          = Flask(__name__, static_url_path="/static")
+LOG          = app.logger()
 executor     = Executor(app)
 app.wsgi_app = ProxyFix(app.wsgi_app, x_for=1, x_proto=1, x_host=1, x_prefix=1)