Skip to content

Commit b1884e5

Browse files
committed
Move logger to module gardenlinux
Signed-off-by: Tobias Wolf <[email protected]>
1 parent c8046d1 commit b1884e5

File tree

3 files changed

+15
-13
lines changed

3 files changed

+15
-13
lines changed

src/gardenlinux/features/parser.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# -*- coding: utf-8 -*-
2+
13
from glob import glob
24
from typing import Callable, Optional
35
import logging
@@ -7,6 +9,8 @@
79
import subprocess
810
import yaml
911

12+
from ..logger import LoggerSetup
13+
1014

1115
class Parser(object):
1216
def __init__(self, gardenlinux_root: str = ".", feature_dir_name: str = "features", logger: Optional[logging.Logger] = None):
@@ -15,17 +19,14 @@ def __init__(self, gardenlinux_root: str = ".", feature_dir_name: str = "feature
1519
if not os.access(feature_base_dir, os.R_OK):
1620
raise ValueError("Feature directory given is invalid: {0}".format(feature_base_dir))
1721

22+
if logger is None or not logger.hasHandlers():
23+
logger = LoggerSetup.get_logger("gardenlinux.features")
24+
1825
self._feature_base_dir = feature_base_dir
1926

2027
self._graph = None
2128
self._logger = logger
2229

23-
if self._logger is None:
24-
self._logger = logging.getLogger("gardenlinux.features")
25-
26-
if not self._logger.hasHandlers():
27-
self._logger.addHandler(logging.NullHandler())
28-
2930
self._logger.debug("features.Parser initialized for directory: {0}".format(feature_base_dir))
3031

3132
@property

src/gardenlinux/flavors/parser.py

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,23 @@
1+
# -*- coding: utf-8 -*-
2+
13
from jsonschema import validate as jsonschema_validate
24
import fnmatch
3-
import logging
45
import yaml
56

67
from ..constants import GL_FLAVORS_SCHEMA
8+
from ..logger import LoggerSetup
79

810
class Parser(object):
911
def __init__(self, data, logger = None):
1012
flavors_data = (yaml.safe_load(data) if isinstance(data, str) else data)
1113
jsonschema_validate(instance=flavors_data, schema=GL_FLAVORS_SCHEMA)
1214

15+
if logger is None or not logger.hasHandlers():
16+
logger = LoggerSetup.get_logger("gardenlinux.flavors")
17+
1318
self._flavors_data = flavors_data
1419
self._logger = logger
1520

16-
if self._logger is None:
17-
self._logger = logging.getLogger("gardenlinux.flavors")
18-
19-
if not self._logger.hasHandlers():
20-
self._logger.addHandler(logging.NullHandler())
21-
2221
self._logger.debug("flavors.Parser initialized with data: {0!r}".format(flavors_data))
2322

2423
def filter(
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# -*- coding: utf-8 -*-
2+
13
import logging
24

35

0 commit comments

Comments
 (0)