diff --git a/.gitignore b/.gitignore index 53f806b1..7aa68143 100644 --- a/.gitignore +++ b/.gitignore @@ -12,4 +12,3 @@ result* *screenshot.png output todo -log/ diff --git a/panel/default.nix b/panel/default.nix index 6c214660..06d1a487 100644 --- a/panel/default.nix +++ b/panel/default.nix @@ -31,7 +31,6 @@ in DATABASE_URL = "sqlite:///${toString ./src}/db.sqlite3"; # locally: use a fixed relative reference, so we can use our newest files without copying to the store REPO_DIR = toString ../.; - LOGGING_DIR = "../log"; }; shellHook = '' ln -sf ${sources.htmx}/dist/htmx.js src/panel/static/htmx.min.js diff --git a/panel/nix/configuration.nix b/panel/nix/configuration.nix index 4cc4e9ea..6061e559 100644 --- a/panel/nix/configuration.nix +++ b/panel/nix/configuration.nix @@ -30,7 +30,6 @@ let (builtins.toFile "extra-settings.py" cfg.extra-settings) ]; REPO_DIR = import ../../launch/tf-env.nix { inherit lib pkgs; }; - LOGGING_DIR = "/var/log/${name}"; SSH_PRIVATE_KEY_FILE = config.age.secrets.panel-ssh-key.path; }; diff --git a/panel/src/panel/settings.py b/panel/src/panel/settings.py index 52761d60..27398b47 100644 --- a/panel/src/panel/settings.py +++ b/panel/src/panel/settings.py @@ -176,9 +176,6 @@ COMPRESS_PRECOMPILERS = [ DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField' -logging_dir = env["LOGGING_DIR"] -os.makedirs(logging_dir, mode=0o700, exist_ok=True) - LOGGING = { "version": 1, "disable_existing_loggers": False, @@ -217,15 +214,10 @@ LOGGING = { "filters": ["require_debug_false"], "class": "django.utils.log.AdminEmailHandler", }, - "file": { - "level": "INFO", - "class": "logging.FileHandler", - "filename": f"{logging_dir}/info.log", - }, }, "loggers": { "": { - "handlers": ["console", "file"], + "handlers": ["console"], "level": "DEBUG" if DEBUG else "INFO", }, },