[REFACTOR] Remove LOG_LEVEL parameter from setup_logger calls in job scripts

This commit is contained in:
Théophile Diot 2025-01-17 09:42:21 +01:00
parent 65a611072b
commit 9e13f15807
No known key found for this signature in database
GPG key ID: FA995104A0BA376A
23 changed files with 31 additions and 31 deletions

View file

@ -50,7 +50,7 @@ def check_line(kind: str, line: bytes) -> Tuple[bool, bytes]:
return False, b""
LOGGER = setup_logger("BLACKLIST", getenv("LOG_LEVEL", "INFO"))
LOGGER = setup_logger("BLACKLIST")
status = 0
KINDS = ("IP", "RDNS", "ASN", "USER_AGENT", "URI", "IGNORE_IP", "IGNORE_RDNS", "IGNORE_ASN", "IGNORE_USER_AGENT", "IGNORE_URI")

View file

@ -14,7 +14,7 @@ from logger import setup_logger # type: ignore
from jobs import Job # type: ignore
from common_utils import bytes_hash # type: ignore
LOGGER = setup_logger("BUNKERNET", getenv("LOG_LEVEL", "INFO"))
LOGGER = setup_logger("BUNKERNET")
exit_status = 0
try:

View file

@ -12,7 +12,7 @@ from bunkernet import register
from logger import setup_logger # type: ignore
from jobs import Job # type: ignore
LOGGER = setup_logger("BUNKERNET", getenv("LOG_LEVEL", "INFO"))
LOGGER = setup_logger("BUNKERNET")
exit_status = 0
try:

View file

@ -17,7 +17,7 @@ from common_utils import bytes_hash # type: ignore
from jobs import Job # type: ignore
from logger import setup_logger # type: ignore
LOGGER = setup_logger("CUSTOM-CERT", getenv("LOG_LEVEL", "INFO"))
LOGGER = setup_logger("CUSTOM-CERT")
JOB = Job(LOGGER, __file__)

View file

@ -11,7 +11,7 @@ for deps_path in [join(sep, "usr", "share", "bunkerweb", *paths) for paths in ((
from Database import Database # type: ignore
from logger import setup_logger # type: ignore
LOGGER = setup_logger("DB.CLEANUP-EXCESS-JOBS-RUNS", getenv("LOG_LEVEL", "INFO"))
LOGGER = setup_logger("DB.CLEANUP-EXCESS-JOBS-RUNS")
status = 0
try:

View file

@ -50,7 +50,7 @@ def check_line(kind: str, line: bytes) -> Tuple[bool, bytes]:
return False, b""
LOGGER = setup_logger("GREYLIST", getenv("LOG_LEVEL", "INFO"))
LOGGER = setup_logger("GREYLIST")
status = 0
KINDS = ("IP", "RDNS", "ASN", "USER_AGENT", "URI")

View file

@ -1,6 +1,6 @@
#!/usr/bin/env python3
from os import getenv, sep
from os import sep
from os.path import join
from sys import exit as sys_exit, path as sys_path
@ -11,7 +11,7 @@ for deps_path in [join(sep, "usr", "share", "bunkerweb", *paths) for paths in ((
from jobs import Job # type: ignore
from logger import setup_logger # type: ignore
LOGGER = setup_logger("FAILOVER-BACKUP", getenv("LOG_LEVEL", "INFO"))
LOGGER = setup_logger("FAILOVER-BACKUP")
status = 0
try:

View file

@ -3,7 +3,7 @@
from datetime import date, datetime, timedelta
from gzip import decompress
from io import BytesIO
from os import getenv, sep
from os import sep
from os.path import join
from pathlib import Path
from sys import exit as sys_exit, path as sys_path
@ -20,7 +20,7 @@ from logger import setup_logger # type: ignore
from common_utils import bytes_hash, file_hash # type: ignore
from jobs import Job # type: ignore
LOGGER = setup_logger("JOBS.mmdb-asn", getenv("LOG_LEVEL", "INFO"))
LOGGER = setup_logger("JOBS.mmdb-asn")
status = 0

View file

@ -3,7 +3,7 @@
from datetime import date, datetime, timedelta
from gzip import decompress
from io import BytesIO
from os import getenv, sep
from os import sep
from os.path import join
from pathlib import Path
from sys import exit as sys_exit, path as sys_path
@ -20,7 +20,7 @@ from logger import setup_logger # type: ignore
from common_utils import bytes_hash, file_hash # type: ignore
from jobs import Job # type: ignore
LOGGER = setup_logger("JOBS.mmdb-country", getenv("LOG_LEVEL", "INFO"))
LOGGER = setup_logger("JOBS.mmdb-country")
status = 0

View file

@ -1,6 +1,6 @@
#!/usr/bin/env python3
from os import getenv, sep
from os import sep
from os.path import join
from sys import exit as sys_exit, path as sys_path
@ -13,7 +13,7 @@ from requests import get
from common_utils import get_version # type: ignore
from logger import setup_logger # type: ignore
LOGGER = setup_logger("UPDATE-CHECK", getenv("LOG_LEVEL", "INFO"))
LOGGER = setup_logger("UPDATE-CHECK")
status = 0
try:

View file

@ -14,7 +14,7 @@ from common_utils import get_integration # type: ignore
from logger import setup_logger # type: ignore
from API import API # type: ignore
LOGGER = setup_logger("Lets-encrypt.auth", getenv("LOG_LEVEL", "INFO"))
LOGGER = setup_logger("Lets-encrypt.auth")
status = 0
try:

View file

@ -14,7 +14,7 @@ from common_utils import get_integration # type: ignore
from logger import setup_logger # type: ignore
from API import API # type: ignore
LOGGER = setup_logger("Lets-encrypt.cleanup", getenv("LOG_LEVEL", "INFO"))
LOGGER = setup_logger("Lets-encrypt.cleanup")
status = 0
try:

View file

@ -14,7 +14,7 @@ from Database import Database # type: ignore
from logger import setup_logger # type: ignore
from API import API # type: ignore
LOGGER = setup_logger("Lets-encrypt.deploy", getenv("LOG_LEVEL", "INFO"))
LOGGER = setup_logger("Lets-encrypt.deploy")
status = 0
try:

View file

@ -42,11 +42,11 @@ from common_utils import bytes_hash # type: ignore
from jobs import Job # type: ignore
from logger import setup_logger # type: ignore
LOGGER = setup_logger("LETS-ENCRYPT.new", getenv("LOG_LEVEL", "INFO"))
LOGGER = setup_logger("LETS-ENCRYPT.new")
CERTBOT_BIN = join(sep, "usr", "share", "bunkerweb", "deps", "python", "bin", "certbot")
DEPS_PATH = join(sep, "usr", "share", "bunkerweb", "deps", "python")
LOGGER_CERTBOT = setup_logger("LETS-ENCRYPT.new.certbot", getenv("LOG_LEVEL", "INFO"))
LOGGER_CERTBOT = setup_logger("LETS-ENCRYPT.new.certbot")
status = 0
PLUGIN_PATH = Path(sep, "usr", "share", "bunkerweb", "core", "letsencrypt")

View file

@ -13,12 +13,12 @@ for deps_path in [join(sep, "usr", "share", "bunkerweb", *paths) for paths in ((
from logger import setup_logger # type: ignore
from jobs import Job # type: ignore
LOGGER = setup_logger("LETS-ENCRYPT.renew", getenv("LOG_LEVEL", "INFO"))
LOGGER = setup_logger("LETS-ENCRYPT.renew")
LIB_PATH = Path(sep, "var", "lib", "bunkerweb", "letsencrypt")
CERTBOT_BIN = join(sep, "usr", "share", "bunkerweb", "deps", "python", "bin", "certbot")
DEPS_PATH = join(sep, "usr", "share", "bunkerweb", "deps", "python")
LOGGER_CERTBOT = setup_logger("LETS-ENCRYPT.renew.certbot", getenv("LOG_LEVEL", "INFO"))
LOGGER_CERTBOT = setup_logger("LETS-ENCRYPT.renew.certbot")
status = 0
CACHE_PATH = Path(sep, "var", "cache", "bunkerweb", "letsencrypt")

View file

@ -17,7 +17,7 @@ from jobs import Job # type: ignore
from requests import post
LOGGER = setup_logger("ANONYMOUS-REPORT", getenv("LOG_LEVEL", "INFO"))
LOGGER = setup_logger("ANONYMOUS-REPORT")
status = 0

View file

@ -1,6 +1,6 @@
#!/usr/bin/env python3
from os import getenv, sep
from os import sep
from os.path import join
from pathlib import Path
from subprocess import DEVNULL, run
@ -13,8 +13,8 @@ for deps_path in [join(sep, "usr", "share", "bunkerweb", *paths) for paths in ((
from logger import setup_logger # type: ignore
from jobs import Job # type: ignore
LOGGER = setup_logger("DEFAULT-SERVER-CERT", getenv("LOG_LEVEL", "INFO"))
LOGGER_OPENSSL = setup_logger("DEFAULT-SERVER-CERT.openssl", getenv("LOG_LEVEL", "INFO"))
LOGGER = setup_logger("DEFAULT-SERVER-CERT")
LOGGER_OPENSSL = setup_logger("DEFAULT-SERVER-CERT.openssl")
status = 0
try:

View file

@ -36,7 +36,7 @@ from logger import setup_logger # type: ignore
EXTERNAL_PLUGINS_DIR = Path(sep, "etc", "bunkerweb", "plugins")
TMP_DIR = Path(sep, "var", "tmp", "bunkerweb", "plugins")
LOGGER = setup_logger("Jobs.download-plugins", getenv("LOG_LEVEL", "INFO"))
LOGGER = setup_logger("Jobs.download-plugins")
status = 0

View file

@ -19,7 +19,7 @@ from requests import RequestException, get
from logger import setup_logger # type: ignore
from jobs import Job # type: ignore
LOGGER = setup_logger("MODSECURITY.coreruleset-nightly", getenv("LOG_LEVEL", "INFO"))
LOGGER = setup_logger("MODSECURITY.coreruleset-nightly")
status = 0
CRS_NIGHTLY_PATH = Path(sep, "var", "cache", "bunkerweb", "modsecurity", "crs", "nightly")

View file

@ -33,7 +33,7 @@ STATUS_MESSAGES = {
"expired": "has expired",
"suspended": "has been suspended",
}
LOGGER = setup_logger("Jobs.download-pro-plugins", getenv("LOG_LEVEL", "INFO"))
LOGGER = setup_logger("Jobs.download-pro-plugins")
status = 0

View file

@ -29,7 +29,7 @@ def check_line(line):
return False, b""
LOGGER = setup_logger("REALIP", getenv("LOG_LEVEL", "INFO"))
LOGGER = setup_logger("REALIP")
REALIP_CACHE_PATH = join(sep, "var", "cache", "bunkerweb", "realip")
status = 0

View file

@ -18,7 +18,7 @@ from cryptography.hazmat.backends import default_backend
from logger import setup_logger # type: ignore
from jobs import Job # type: ignore
LOGGER = setup_logger("self-signed", getenv("LOG_LEVEL", "INFO"))
LOGGER = setup_logger("self-signed")
JOB = Job(LOGGER, __file__)
status = 0

View file

@ -50,7 +50,7 @@ def check_line(kind: str, line: bytes) -> Tuple[bool, bytes]:
return False, b""
LOGGER = setup_logger("WHITELIST", getenv("LOG_LEVEL", "INFO"))
LOGGER = setup_logger("WHITELIST")
status = 0
KINDS = ("IP", "RDNS", "ASN", "USER_AGENT", "URI")