diff options
Diffstat (limited to 'cloudinit/config/cc_package_update_upgrade_install.py')
| -rw-r--r-- | cloudinit/config/cc_package_update_upgrade_install.py | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/cloudinit/config/cc_package_update_upgrade_install.py b/cloudinit/config/cc_package_update_upgrade_install.py index 7d346a19..7935c33a 100644 --- a/cloudinit/config/cc_package_update_upgrade_install.py +++ b/cloudinit/config/cc_package_update_upgrade_install.py @@ -8,7 +8,6 @@ import os import time -from logging import Logger from textwrap import dedent from cloudinit import log as logging @@ -60,6 +59,7 @@ meta: MetaSchema = { } __doc__ = get_meta_doc(meta) +LOG = logging.getLogger(__name__) def _multi_cfg_bool_get(cfg, *keys): @@ -69,7 +69,7 @@ def _multi_cfg_bool_get(cfg, *keys): return False -def _fire_reboot(log, wait_attempts=6, initial_sleep=1, backoff=2): +def _fire_reboot(wait_attempts=6, initial_sleep=1, backoff=2): subp.subp(REBOOT_CMD) start = time.time() wait_time = initial_sleep @@ -77,7 +77,7 @@ def _fire_reboot(log, wait_attempts=6, initial_sleep=1, backoff=2): time.sleep(wait_time) wait_time *= backoff elapsed = time.time() - start - log.debug("Rebooted, but still running after %s seconds", int(elapsed)) + LOG.debug("Rebooted, but still running after %s seconds", int(elapsed)) # If we got here, not good elapsed = time.time() - start raise RuntimeError( @@ -85,9 +85,7 @@ def _fire_reboot(log, wait_attempts=6, initial_sleep=1, backoff=2): ) -def handle( - name: str, cfg: Config, cloud: Cloud, log: Logger, args: list -) -> None: +def handle(name: str, cfg: Config, cloud: Cloud, args: list) -> None: # Handle the old style + new config names update = _multi_cfg_bool_get(cfg, "apt_update", "package_update") upgrade = _multi_cfg_bool_get(cfg, "package_upgrade", "apt_upgrade") @@ -101,21 +99,21 @@ def handle( try: cloud.distro.update_package_sources() except Exception as e: - util.logexc(log, "Package update failed") + util.logexc(LOG, "Package update failed") errors.append(e) if upgrade: try: cloud.distro.package_command("upgrade") except Exception as e: - util.logexc(log, "Package upgrade failed") + util.logexc(LOG, "Package upgrade failed") errors.append(e) if len(pkglist): try: cloud.distro.install_packages(pkglist) except Exception as e: - util.logexc(log, "Failed to install packages: %s", pkglist) + util.logexc(LOG, "Failed to install packages: %s", pkglist) errors.append(e) # TODO(smoser): handle this less violently @@ -125,18 +123,18 @@ def handle( reboot_fn_exists = os.path.isfile(REBOOT_FILE) if (upgrade or pkglist) and reboot_if_required and reboot_fn_exists: try: - log.warning( + LOG.warning( "Rebooting after upgrade or install per %s", REBOOT_FILE ) # Flush the above warning + anything else out... - logging.flushLoggers(log) - _fire_reboot(log) + logging.flushLoggers(LOG) + _fire_reboot() except Exception as e: - util.logexc(log, "Requested reboot did not happen!") + util.logexc(LOG, "Requested reboot did not happen!") errors.append(e) if len(errors): - log.warning( + LOG.warning( "%s failed with exceptions, re-raising the last one", len(errors) ) raise errors[-1] |