Skip to content

Commit 7df1128

Browse files
committed
deptool: Move towards more standardized logging
Signed-off-by: Ole Herman Schumacher Elgesem <[email protected]>
1 parent ca72e9c commit 7df1128

File tree

1 file changed

+6
-8
lines changed

1 file changed

+6
-8
lines changed

src/cfengine_cli/deptool.py

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import argparse
22
import collections
33
import json
4-
import logging as log
4+
from cf_remote import log
5+
import logging
56
import os
67
import re
78
import subprocess
@@ -110,19 +111,16 @@ def __init__(
110111
repo_url = "https://github.com/{}/{}.git".format(repo_owner, repo_name)
111112

112113
# set up a logger to intercept command output to logging.INFO instead of displaying it
113-
if log_info:
114-
LOGGING_LEVEL = log.INFO
115-
else:
116-
LOGGING_LEVEL = log.WARNING
117-
self.run_logger = log.getLogger("output_run_to_logging")
114+
LOGGING_LEVEL = logging.INFO if log_info else logging.WARNING
115+
self.run_logger = logging.getLogger("output_run_to_logging")
118116
# do not duplicate logs with the root logger:
119117
self.run_logger.propagate = False
120118
self.run_logger.setLevel(LOGGING_LEVEL)
121-
handler = log.StreamHandler()
119+
handler = logging.StreamHandler()
122120
# do not terminate logs with a newline, as the output already has newlines:
123121
handler.terminator = ""
124122
handler.setLevel(LOGGING_LEVEL)
125-
log_format = log.Formatter("%(asctime)s %(levelname)s: %(message)s")
123+
log_format = logging.Formatter("%(asctime)s %(levelname)s: %(message)s")
126124
handler.setFormatter(log_format)
127125
self.run_logger.addHandler(handler)
128126

0 commit comments

Comments
 (0)