From 0c6e93aa6709811a603f6a20bc193949b12487c7 Mon Sep 17 00:00:00 2001 From: aptalca <541623+aptalca@users.noreply.github.com> Date: Wed, 18 Sep 2024 12:56:26 -0400 Subject: [PATCH] suppress creation of empty log file when WenUI password is set --- README.md | 1 + readme-vars.yml | 1 + root/etc/s6-overlay/s6-rc.d/init-flexget-config/run | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 24872f4..d9618e1 100644 --- a/README.md +++ b/README.md @@ -302,6 +302,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **18.09.24:** - Suppress creation of empty log file when WebUI password is set. * **17.08.24:** - Revert to Alpine 3.20 due to 1st party plugin incompatibility with Python 3.12. * **19.06.24:** - Rebase to Alpine 3.20. * **20.03.24:** - Rebase to Alpine 3.19. diff --git a/readme-vars.yml b/readme-vars.yml index ff984fb..1ea8286 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -55,6 +55,7 @@ app_setup_block: | # changelog changelogs: + - { date: "18.09.24:", desc: "Suppress creation of empty log file when WebUI password is set."} - { date: "17.08.24:", desc: "Revert to Alpine 3.20 due to 1st party plugin incompatibility with Python 3.12."} - { date: "19.06.24:", desc: "Rebase to Alpine 3.20."} - { date: "20.03.24:", desc: "Rebase to Alpine 3.19."} diff --git a/root/etc/s6-overlay/s6-rc.d/init-flexget-config/run b/root/etc/s6-overlay/s6-rc.d/init-flexget-config/run index 11b33c4..ff6cd48 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-flexget-config/run +++ b/root/etc/s6-overlay/s6-rc.d/init-flexget-config/run @@ -29,7 +29,7 @@ if [[ ! -f "${FG_CONFIG_FILE}" ]]; then fi if [[ -n "${FG_WEBUI_PASSWORD}" ]]; then - if ! flexget -c "${FG_CONFIG_FILE}" --loglevel error web passwd "${FG_WEBUI_PASSWORD}" | tee /dev/stderr | grep -q 'Updated password'; then + if ! flexget -c "${FG_CONFIG_FILE}" --logfile "${FG_LOG_FILE:-/config/.flexget/flexget.log}" --loglevel error web passwd "${FG_WEBUI_PASSWORD}" | tee /dev/stderr | grep -q 'Updated password'; then echo "Halting init, please address the above issues and recreate the container" sleep infinity fi