From 58ff00fd38e85d598d09f688691e2b6da6cd34f4 Mon Sep 17 00:00:00 2001 From: iFargle Date: Wed, 15 Feb 2023 19:04:47 +0900 Subject: [PATCH] Update logging --- headscale.py | 3 ++- helper.py | 5 ++--- renderer.py | 3 ++- server.py | 2 ++ 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/headscale.py b/headscale.py index c82dbe4..adcf819 100644 --- a/headscale.py +++ b/headscale.py @@ -4,13 +4,14 @@ from cryptography.fernet import Fernet from datetime import datetime, timedelta, date from dateutil import parser +log = logging.getLogger('server.headscale') + # log = logging.getLogger('server.headscale') # handler = logging.StreamHandler(sys.stderr) # handler.setFormatter(logging.Formatter('%(name)s - %(levelname)s - %(message)s')) # log.addHandler(handler) # log.setLevel(logging.INFO) -log = logging.getLogger('server.headscale') ################################################################## # Functions related to HEADSCALE and API KEYS diff --git a/helper.py b/helper.py index 1e9cd49..9161550 100644 --- a/helper.py +++ b/helper.py @@ -1,16 +1,15 @@ - import logging, sys, pytz, os, headscale, requests from datetime import datetime, timedelta, date from dateutil import parser +log = logging.getLogger('server.helper') + # log = logging.getLogger('server.helper') # handler = logging.StreamHandler(sys.stderr) # handler.setFormatter(logging.Formatter('%(name)s - %(levelname)s - %(message)s')) # log.addHandler(handler) # log.setLevel(logging.INFO) -log = logging.getLogger('server.helper') - def pretty_print_duration(duration): days, seconds = duration.days, duration.seconds hours = (days * 24 + seconds // 3600) diff --git a/renderer.py b/renderer.py index 27a57d7..871b048 100644 --- a/renderer.py +++ b/renderer.py @@ -7,10 +7,11 @@ from dateutil import parser from concurrent.futures import wait, ALL_COMPLETED from flask_executor import Executor +log = logging.getLogger('server.renderer') + app = Flask(__name__) executor = Executor(app) -log = logging.getLogger('server.renderer') def render_overview(): url = headscale.get_url() diff --git a/server.py b/server.py index 73bdfe0..93633f6 100644 --- a/server.py +++ b/server.py @@ -7,6 +7,8 @@ from dateutil import parser from concurrent.futures import wait, ALL_COMPLETED from flask_executor import Executor +log = logging.getLogger('server.server') + # Global vars # Colors: https://materializecss.com/color.html COLOR_NAV = "blue-grey darken-1"