Skip to content

Commit c230772

Browse files
authored
Merge pull request #34 from synkd/fix_cli_log_level
Make CLI respect log_level setting
2 parents 8ff1e29 + 87d5c61 commit c230772

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

manifester/logger.py

+1-6
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44

55
import logzero
66

7-
from manifester.settings import settings
8-
97

108
def setup_logzero(level="info", path="logs/manifester.log", silent=True):
119
"""Call logzero setup with the given settings."""
@@ -17,13 +15,10 @@ def setup_logzero(level="info", path="logs/manifester.log", silent=True):
1715
log_level = getattr(logging, level.upper(), logging.INFO)
1816
# formatter for terminal
1917
formatter = logzero.LogFormatter(fmt=debug_fmt if log_level is logging.DEBUG else log_fmt)
20-
logzero.setup_default_logger(formatter=formatter, disableStderrLogger=silent)
18+
logzero.setup_logger(formatter=formatter, disableStderrLogger=silent)
2119
logzero.loglevel(log_level)
2220
# formatter for file
2321
formatter = logzero.LogFormatter(
2422
fmt=debug_fmt if log_level is logging.DEBUG else log_fmt, color=False
2523
)
2624
logzero.logfile(path, loglevel=log_level, maxBytes=1e9, backupCount=3, formatter=formatter)
27-
28-
29-
setup_logzero(level=settings.get("log_level", "info"))

manifester/manifester.py

+3
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,11 @@
1818
simple_retry,
1919
update_inventory,
2020
)
21+
from manifester.logger import setup_logzero
2122
from manifester.settings import settings
2223

24+
setup_logzero(level=settings.get("log_level", "info"))
25+
2326

2427
class Manifester:
2528
"""Main Manifester class responsible for generating a manifest from the provided settings."""

0 commit comments

Comments
 (0)