linux - improve logging for jobs

This commit is contained in:
fl0ppy-d1sk 2024-09-17 10:32:42 +02:00
parent 1acef1f69d
commit 7054ee2341
4 changed files with 9 additions and 7 deletions

View file

@ -43,7 +43,7 @@ jobs:
run: chmod +x ./misc/update-version.sh && ./misc/update-version.sh ${{ inputs.RELEASE }}
- name: Replace VERSION 1.5
if: inputs.RELEASE == '1.5'
run: chmod +x ./misc/update-version.sh && ./misc/update-version.sh dev
run: chmod +x ./misc/update-version.sh && ./misc/update-version.sh 1.5-dev
- name: Extract arch
run: |
echo "ARCH=${{ env.PLATFORMS }}" | sed 's/linux//g' | sed 's@/@@g' >> "$GITHUB_ENV"

View file

@ -4,6 +4,8 @@ from logging import (
ERROR,
INFO,
WARNING,
FileHandler,
Formatter,
Logger,
_nameToLevel,
addLevelName,
@ -58,4 +60,9 @@ def setup_logger(title: str, level: Optional[Union[str, int]] = None) -> Logger:
else:
logger.setLevel(level)
if getenv("SCHEDULER_LOG_TO_FILE", "no") == "yes":
file_handler = FileHandler("/var/log/bunkerweb/scheduler.log")
file_handler.setFormatter(Formatter("%(asctime)s [%(name)s] [%(process)d] [%(levelname)s] - %(message)s"))
logger.addHandler(file_handler)
return logger

View file

@ -215,7 +215,7 @@ function start() {
# Execute scheduler
log "SYSTEMCTL" " " "Executing scheduler ..."
export LOG_TO_FILE=yes
export SCHEDULER_LOG_TO_FILE=yes
sudo -E -u nginx -g nginx /bin/bash -c "PYTHONPATH=/usr/share/bunkerweb/deps/python/ /usr/share/bunkerweb/scheduler/main.py --variables /etc/bunkerweb/variables.env"
# shellcheck disable=SC2181
if [ $? -ne 0 ] ; then

View file

@ -79,11 +79,6 @@ SCHEDULER_TMP_ENV_PATH.touch()
DB_LOCK_FILE = Path(sep, "var", "lib", "bunkerweb", "db.lock")
logger = setup_logger("Scheduler", getenv("LOG_LEVEL", "INFO"))
if environ.get("LOG_TO_FILE", "no") == "yes":
file_handler = FileHandler("/var/log/bunkerweb/scheduler.log")
file_handler.setFormatter(Formatter("%(asctime)s [%(name)s] [%(process)d] [%(levelname)s] - %(message)s"))
logger.addHandler(file_handler)
SLAVE_MODE = environ.get("SLAVE_MODE", "no") == "yes"
MASTER_MODE = environ.get("MASTER_MODE", "no") == "yes"