Skip to content

Commit c2bc731

Browse files
committed
Fix: Log level could not be configured from settings
Solution: Add a `LOG_LEVEL` setting defaulting to "WARNING". Replace PR #581 #581
1 parent 451f246 commit c2bc731

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

src/aleph/vm/conf.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,7 @@ class Settings(BaseSettings):
147147
# System logs make boot ~2x slower
148148
PRINT_SYSTEM_LOGS = False
149149
IGNORE_TRACEBACK_FROM_DIAGNOSTICS = True
150+
LOG_LEVEL = "WARNING"
150151
DEBUG_ASYNCIO = False
151152

152153
# Networking does not work inside Docker/Podman

src/aleph/vm/orchestrator/cli.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ def parse_args(args):
6666
help="set loglevel to INFO",
6767
action="store_const",
6868
const=logging.INFO,
69-
default=logging.WARNING,
69+
default=settings.LOG_LEVEL,
7070
)
7171
parser.add_argument(
7272
"-vv",
@@ -298,7 +298,12 @@ def main():
298298
)
299299
# log_format = "[%(asctime)s] p%(process)s {%(pathname)s:%(lineno)d} %(levelname)s - %(message)s"
300300

301-
setup_handlers(args, log_format)
301+
handlers = setup_handlers(args, log_format)
302+
logging.basicConfig(
303+
level=args.loglevel,
304+
format=log_format,
305+
handlers=handlers,
306+
)
302307

303308
logging.getLogger("aiosqlite").setLevel(logging.WARNING)
304309
logging.getLogger("sqlalchemy.engine").setLevel(logging.WARNING)

src/aleph/vm/orchestrator/custom_logs.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,4 @@ def setup_handlers(args, log_format):
4949
non_execution_handler.setFormatter(
5050
logging.Formatter("%(asctime)s | %(levelname)s %(name)s:%(lineno)s | %(message)s ")
5151
)
52-
logging.basicConfig(
53-
level=args.loglevel,
54-
format=log_format,
55-
handlers=[non_execution_handler, execution_handler],
56-
)
52+
return [non_execution_handler, execution_handler]

0 commit comments

Comments
 (0)