diff options
| author | Brett Holman <brett.holman@canonical.com> | 2023-05-04 16:59:44 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-04 16:59:44 -0600 |
| commit | e8ef58b9c07a851d62777c68c34d26b8088597ff (patch) | |
| tree | 5c80b001e7cccdcfc836fcd03fbb8afae21ead7a | |
| parent | ed2ebf09049735f1628961697b5f6efdbe3690b7 (diff) | |
| download | cloud-init-git-e8ef58b9c07a851d62777c68c34d26b8088597ff.tar.gz | |
Fix logger, use instance rather than module function (#2163)
* Fix logger, use instance rather than module function
* add dunder names
| -rwxr-xr-x | cloudinit/cmd/main.py | 2 | ||||
| -rw-r--r-- | cloudinit/net/cmdline.py | 4 | ||||
| -rw-r--r-- | cloudinit/netinfo.py | 2 | ||||
| -rw-r--r-- | cloudinit/warnings.py | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/cloudinit/cmd/main.py b/cloudinit/cmd/main.py index 70efa7b7..a1dc5d30 100755 --- a/cloudinit/cmd/main.py +++ b/cloudinit/cmd/main.py @@ -67,7 +67,7 @@ FREQ_SHORT_NAMES = { "once": PER_ONCE, } -LOG = logging.getLogger() +LOG = logging.getLogger(__name__) # Used for when a logger may not be active diff --git a/cloudinit/net/cmdline.py b/cloudinit/net/cmdline.py index 5df2f214..c5024654 100644 --- a/cloudinit/net/cmdline.py +++ b/cloudinit/net/cmdline.py @@ -21,6 +21,8 @@ _OPEN_ISCSI_INTERFACE_FILE = "/run/initramfs/open-iscsi.interface" KERNEL_CMDLINE_NETWORK_CONFIG_DISABLED = "disabled" +LOG = logging.getLogger(__name__) + class InitramfsNetworkConfigSource(metaclass=abc.ABCMeta): """ABC for net config sources that read config written by initramfses""" @@ -258,7 +260,7 @@ def _b64dgz(data): try: blob = base64.b64decode(data) except (TypeError, ValueError): - logging.error( + LOG.error( "Expected base64 encoded kernel commandline parameter" " network-config. Ignoring network-config=%s.", data, diff --git a/cloudinit/netinfo.py b/cloudinit/netinfo.py index a3bca86e..0daa27f7 100644 --- a/cloudinit/netinfo.py +++ b/cloudinit/netinfo.py @@ -18,7 +18,7 @@ from cloudinit import subp, util from cloudinit.net.network_state import net_prefix_to_ipv4_mask from cloudinit.simpletable import SimpleTable -LOG = logging.getLogger() +LOG = logging.getLogger(__name__) # Example netdev format: # {'eth0': {'hwaddr': '00:16:3e:16:db:54', diff --git a/cloudinit/warnings.py b/cloudinit/warnings.py index 7ddd2f8d..3c560436 100644 --- a/cloudinit/warnings.py +++ b/cloudinit/warnings.py @@ -7,7 +7,7 @@ from cloudinit import helpers from cloudinit import log as logging from cloudinit import util -LOG = logging.getLogger() +LOG = logging.getLogger(__name__) WARNINGS = { "non_ec2_md": """ |