From 2542e0e082e25889dbd1b76a9323a621e6e31707 Mon Sep 17 00:00:00 2001 From: iFargle Date: Wed, 15 Feb 2023 20:22:15 +0900 Subject: [PATCH] Test --- helper.py | 7 +++++-- server.py | 4 +++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/helper.py b/helper.py index ea5c3a1..26b3206 100644 --- a/helper.py +++ b/helper.py @@ -156,11 +156,14 @@ def startup_checks(): if os.access('/etc/headscale/config.yaml', os.R_OK): app.logger.warning("/etc/headscale/config.yaml: READ: PASS") config_readable = True - if os.access('/etc/headscale/config.yml', os.R_OK): + elif os.access('/etc/headscale/config.yml', os.R_OK): app.logger.warning("/etc/headscale/config.yml: READ: PASS") config_readable = True + else: checks_passed = False - if checks_passed: return "Pass" + if checks_passed: + app.logger.warning("All startup checks passed.") + return "Pass" messageHTML = "" # Generate the message: diff --git a/server.py b/server.py index a6d89bb..ef45a88 100644 --- a/server.py +++ b/server.py @@ -38,7 +38,9 @@ app.logger.warning("BASE_PATH: "+BASE_PATH) @app.route(BASE_PATH+'/overview') def overview_page(): # General error checks. See the function for more info: - if helper.startup_checks() != "Pass": return redirect(BASE_PATH+url_for('error_page')) + if helper.startup_checks() != "Pass": + app.logger.debug("Why does this fail? Return value: "+helper.startup_checks()) + return redirect(BASE_PATH+url_for('error_page')) # If the API key fails, redirect to the settings page: if not helper.key_test(): return redirect(BASE_PATH+url_for('settings_page'))