Skip to content

Commit f3292c6

Browse files
authored
Merge pull request #6 from fosslight/dd-jy-patch-1
Add options to change stream and file log level
2 parents 347460e + fcc74c7 commit f3292c6

File tree

3 files changed

+26
-18
lines changed

3 files changed

+26
-18
lines changed

README.md

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,19 @@ Three modules can be called. Please refer to each file for detailed calling meth
4141

4242
### 1. Setup logger (tests/test_log.py)
4343
```
44-
from fosslight_util._set_log import init_log
44+
from fosslight_util.set_log import init_log
4545
46+
# 1st param : log file path
47+
# 2nd param : create file (True/False)
48+
# 3rd param : stream log level
49+
# 4th param : file log level
50+
# =>log level(CRITICAL:50, ERROR:40, WARNING:30, INFO:20, DEBUG:10, NOTSET:0)
4651
4752
def test():
48-
logger = init_log("test_result/log_file1.txt")
53+
logger = init_log("test_result/log_file1.txt", True, 30, 20)
4954
logger.warning("TESTING - Print log")
5055
```
56+
5157

5258
### 2. Write csv and excel files (tests/test_excel.py)
5359
```

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
if __name__ == "__main__":
1414
setup(
1515
name='fosslight_util',
16-
version='1.0.4',
16+
version='1.0.5',
1717
package_dir={"": "src"},
1818
packages=find_packages(where='src'),
1919
description='FOSSLight Util',

src/fosslight_util/set_log.py

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,28 +12,30 @@
1212
from . import constant as constant
1313

1414

15-
def init_log(log_file, create_file=True):
15+
def init_log(log_file, create_file=True, stream_log_level=logging.WARN, file_log_level=logging.INFO):
1616

1717
logger = logging.getLogger(constant.LOGGER_NAME)
18+
1819
if not logger.hasHandlers():
19-
log_level = logging.WARNING
20-
formatter = logging.Formatter('%(message)s')
21-
20+
logger.setLevel(logging.DEBUG)
2221
log_dir = os.path.dirname(log_file)
2322
Path(log_dir).mkdir(parents=True, exist_ok=True)
2423

2524
if create_file:
26-
file_hanlder = logging.FileHandler(log_file)
27-
file_hanlder.setLevel(log_level)
28-
file_hanlder.setFormatter(formatter)
29-
file_hanlder.propagate = False
30-
logger.addHandler(file_hanlder)
31-
32-
console = logging.StreamHandler()
33-
console.setLevel(log_level)
34-
console.setFormatter(formatter)
35-
console.propagate = False
36-
logger.addHandler(console)
25+
26+
file_handlder = logging.FileHandler(log_file)
27+
file_handlder.setLevel(file_log_level)
28+
file_formatter = logging.Formatter('[%(levelname)7s] %(message)s')
29+
file_handlder.setFormatter(file_formatter)
30+
file_handlder.propagate = False
31+
logger.addHandler(file_handlder)
32+
33+
console_handler = logging.StreamHandler()
34+
console_handler.setLevel(stream_log_level)
35+
console_formatter = logging.Formatter('%(message)s')
36+
console_handler.setFormatter(console_formatter)
37+
console_handler.propagate = False
38+
logger.addHandler(console_handler)
3739

3840
logger.propagate = False
3941

0 commit comments

Comments
 (0)