Merge "Revert "Make configure_logging more robust.""

2025-08-20 14:07:48 +00:00
parent 9f0a3ffe1e 9520ba3f8b
commit cb9c6c60d1
37 changed files with 42 additions and 42 deletions
--- a/software/scripts/create-postgres-database
+++ b/software/scripts/create-postgres-database
@@ -119,7 +119,7 @@ class PostgresDatabase:


 if __name__ == "__main__":
-    upgrade_utils.configure_logging("/var/log/software.log", LOG, log_level=logging.INFO)
+    upgrade_utils.configure_logging("/var/log/software.log", log_level=logging.INFO)

    port = None
    error = False
--- a/software/scripts/deploy-precheck
+++ b/software/scripts/deploy-precheck
@@ -515,5 +515,5 @@ def main(argv=None):


 if __name__ == "__main__":
-    upgrade_utils.configure_logging("/var/log/software.log", LOG, log_level=logging.INFO)
+    upgrade_utils.configure_logging("/var/log/software.log", log_level=logging.INFO)
    sys.exit(main())
--- a/software/scripts/deploy-start
+++ b/software/scripts/deploy-start
@@ -202,7 +202,7 @@ class DeployStart:


 if __name__ == "__main__":
-    upgrade_utils.configure_logging("/var/log/software.log", LOG, log_level=logging.INFO)
+    upgrade_utils.configure_logging("/var/log/software.log", log_level=logging.INFO)

    from_version = None
    to_version = None
--- a/software/scripts/major-release-upload
+++ b/software/scripts/major-release-upload
@@ -388,5 +388,5 @@ def main():


 if __name__ == "__main__":
-    upgrade_utils.configure_logging('/var/log/software.log', LOG, log_level=logging.INFO)
+    upgrade_utils.configure_logging('/var/log/software.log', log_level=logging.INFO)
    sys.exit(main())
--- a/software/scripts/prepare-chroot-mounts
+++ b/software/scripts/prepare-chroot-mounts
@@ -110,7 +110,7 @@ class ChrootMounts:


 if __name__ == "__main__":
-    upgrade_utils.configure_logging("/var/log/software.log", LOG, log_level=logging.INFO)
+    upgrade_utils.configure_logging("/var/log/software.log", log_level=logging.INFO)

    checkout_dir = None
    operation = None
--- a/software/scripts/prepare-data-migration
+++ b/software/scripts/prepare-data-migration
@@ -340,5 +340,5 @@ def main(sys_argv):


 if __name__ == "__main__":
-    upgrade_utils.configure_logging("/var/log/software.log", LOG, log_level=logging.INFO)
+    upgrade_utils.configure_logging("/var/log/software.log", log_level=logging.INFO)
    sys.exit(main(sys.argv))
--- a/software/scripts/remove-temporary-data
+++ b/software/scripts/remove-temporary-data
@@ -111,7 +111,7 @@ class RemoveTemporaryData:


 if __name__ == "__main__":
-    upgrade_utils.configure_logging("/var/log/software.log", LOG, log_level=logging.INFO)
+    upgrade_utils.configure_logging("/var/log/software.log", log_level=logging.INFO)

    checkout_dir = None
    for arg in range(1, len(sys.argv)):
--- a/software/scripts/sync-controllers-feed
+++ b/software/scripts/sync-controllers-feed
@@ -98,5 +98,5 @@ def main(sys_argv):
        return 1

 if __name__ == "__main__":
-    upgrade_utils.configure_logging('/var/log/software.log', LOG, log_level=logging.INFO)
+    upgrade_utils.configure_logging('/var/log/software.log', log_level=logging.INFO)
    sys.exit(main(sys.argv))
--- a/software/scripts/upgrade_utils.py
+++ b/software/scripts/upgrade_utils.py
@@ -178,7 +178,7 @@ def get_system_info(sysinv_client):
    return system_info.system_type, system_info.system_mode


-def configure_logging(filename, logger, log_level=logging.INFO):
+def configure_logging(filename, log_level=logging.INFO):
    read_log_config()

    my_exec = os.path.basename(sys.argv[0])
@@ -187,10 +187,10 @@ def configure_logging(filename, logger, log_level=logging.INFO):
    log_format = log_format.replace('%(exec)s', my_exec)
    formatter = logging.Formatter(log_format, datefmt="%FT%T")

-    logger.setLevel(log_level)
+    LOG.setLevel(log_level)
    main_log_handler = logging.FileHandler(filename)
    main_log_handler.setFormatter(formatter)
-    logger.addHandler(main_log_handler)
+    LOG.addHandler(main_log_handler)


 def get_platform_conf(key):
--- a/software/software/lvm_snapshot.py
+++ b/software/software/lvm_snapshot.py
@@ -503,5 +503,5 @@ def main():

 if __name__ == "__main__":
    import upgrade_utils  # pylint: disable=E0401
-    upgrade_utils.configure_logging('/var/log/software.log', LOG, log_level=logging.INFO)
+    upgrade_utils.configure_logging('/var/log/software.log', log_level=logging.INFO)
    sys.exit(main())
--- a/software/software/utilities/activate.py
+++ b/software/software/utilities/activate.py
@@ -5,7 +5,7 @@
 #
 import argparse

-import logging as log
+from oslo_log import log

 from software.states import DEPLOY_STATES
 from software.utilities.update_deploy_state import update_deploy_state
@@ -50,7 +50,7 @@ def do_activate(from_release, to_release, is_major_release):

 def activate():
    # this is the entry point to start activate
-    configure_logging(LOG)
+    configure_logging()
    parser = argparse.ArgumentParser(add_help=False)

    parser.add_argument("from_release",
--- a/software/software/utilities/activate_rollback.py
+++ b/software/software/utilities/activate_rollback.py
@@ -40,7 +40,7 @@ def do_activate_rollback(from_release, to_release):

 def activate_rollback():
    # this is the entry point to start activate-rollback
-    configure_logging(LOG)
+    configure_logging()
    parser = argparse.ArgumentParser(add_help=False)

    parser.add_argument("from_release",
--- a/software/software/utilities/deploy_delete.py
+++ b/software/software/utilities/deploy_delete.py
@@ -44,7 +44,7 @@ def do_deploy_delete(from_release, to_release, plugin_path, is_major_release):

 def deploy_delete():
    # this is the entry point to deploy delete plugin
-    utils.configure_logging(LOG)
+    utils.configure_logging()
    parser = argparse.ArgumentParser(add_help=False)

    plugin_path = os.environ.get('plugin_path')
--- a/software/software/utilities/migrate.py
+++ b/software/software/utilities/migrate.py
@@ -843,7 +843,7 @@ def upgrade_controller(from_release, to_release, target_port):

 def migrate():
    # this is the entry point to start data migration
-    configure_logging(LOG)
+    configure_logging()
    parser = argparse.ArgumentParser(add_help=False)

    parser.add_argument("from_release",
--- a/software/software/utilities/utils.py
+++ b/software/software/utilities/utils.py
@@ -42,7 +42,7 @@ ACTION_ACTIVATE_ROLLBACK = "activate-rollback"
 ACTION_DELETE = "delete"


-def configure_logging(logger):
+def configure_logging():
    cfg.read_config()

    my_exec = os.path.basename(sys.argv[0])
@@ -51,10 +51,10 @@ def configure_logging(logger):
    log_format = log_format.replace('%(exec)s', my_exec)
    formatter = logging.Formatter(log_format, datefmt="%FT%T")

-    logger.setLevel(logging.INFO)
+    LOG.setLevel(logging.INFO)
    main_log_handler = logging.FileHandler(SOFTWARE_LOG_FILE)
    main_log_handler.setFormatter(formatter)
-    logger.addHandler(main_log_handler)
+    LOG.addHandler(main_log_handler)


 def get_migration_scripts(migration_script_dir):
--- a/software/upgrade-scripts/04-remove-mgmt-node-addresses.py
+++ b/software/upgrade-scripts/04-remove-mgmt-node-addresses.py
@@ -47,7 +47,7 @@ def main():
            print("Invalid option %s." % sys.argv[arg])
            return 1
        arg += 1
-    configure_logging(LOG)
+    configure_logging()
    LOG.info(
        "%s invoked from_release = %s to_release = %s action = %s"
        % (sys.argv[0], from_release, to_release, action)
--- a/software/upgrade-scripts/05-remove-admin-node-addresses.py
+++ b/software/upgrade-scripts/05-remove-admin-node-addresses.py
@@ -47,7 +47,7 @@ def main():
            print("Invalid option %s." % sys.argv[arg])
            return 1
        arg += 1
-    configure_logging(LOG)
+    configure_logging()
    LOG.info(
        "%s invoked from_release = %s to_release = %s action = %s"
        % (sys.argv[0], from_release, to_release, action)
--- a/software/upgrade-scripts/06-remove_legacy_upgrade_tables.py
+++ b/software/upgrade-scripts/06-remove_legacy_upgrade_tables.py
@@ -40,7 +40,7 @@ def main():
            print("Invalid option %s." % sys.argv[arg])
            return 1
        arg += 1
-    configure_logging(LOG)
+    configure_logging()
    LOG.info(
        "%s invoked from_release = %s to_release = %s action = %s"
        % (sys.argv[0], from_release, to_release, action)
--- a/software/upgrade-scripts/07-populate-ihost-sw-version-field.py
+++ b/software/upgrade-scripts/07-populate-ihost-sw-version-field.py
@@ -40,7 +40,7 @@ def main():
            print("Invalid option %s." % sys.argv[arg])
            return 1
        arg += 1
-    configure_logging(LOG)
+    configure_logging()
    LOG.info(
        "%s invoked from_release = %s to_release = %s action = %s"
        % (sys.argv[0], from_release, to_release, action)
--- a/software/upgrade-scripts/08-activate-keystone.py
+++ b/software/upgrade-scripts/08-activate-keystone.py
@@ -58,7 +58,7 @@ def main():
            return 1
        arg += 1

-    configure_logging(LOG)
+    configure_logging()
    LOG.info("%s invoked from_release = %s to_release = %s action = %s"
             % (sys.argv[0], from_release, to_release, action))
    res = 0
--- a/software/upgrade-scripts/09-remove-storage-node-addresses.py
+++ b/software/upgrade-scripts/09-remove-storage-node-addresses.py
@@ -47,7 +47,7 @@ def main():
            print("Invalid option %s." % sys.argv[arg])
            return 1
        arg += 1
-    configure_logging(LOG)
+    configure_logging()
    LOG.info(
        "%s invoked from_release = %s to_release = %s action = %s"
        % (sys.argv[0], from_release, to_release, action)
--- a/software/upgrade-scripts/10-add-mgmt-ip-to-kube-apiserver-cert.py
+++ b/software/upgrade-scripts/10-add-mgmt-ip-to-kube-apiserver-cert.py
@@ -75,7 +75,7 @@ def main():
            return ERROR
        arg += 1

-    configure_logging(LOG)
+    configure_logging()
    LOG.info(
        "%s invoked from_release = %s invoked to_release = %s action = %s"
        % (sys.argv[0], from_release, to_release, action)
--- a/software/upgrade-scripts/11-update-static-hieradata.py
+++ b/software/upgrade-scripts/11-update-static-hieradata.py
@@ -44,7 +44,7 @@ def main():
            return 1
        arg += 1

-    configure_logging(LOG)
+    configure_logging()

    LOG.info("%s invoked from_release = %s to_release = %s action = %s"
             % (sys.argv[0], from_release, to_release, action))
--- a/software/upgrade-scripts/12-update-registry-central.py
+++ b/software/upgrade-scripts/12-update-registry-central.py
@@ -88,7 +88,7 @@ def main():
            return 1
        arg += 1

-    configure_logging(LOG)
+    configure_logging()

    LOG.info("%s invoked from_release = %s to_release = %s action = %s"
             % (sys.argv[0], from_release, to_release, action))
--- a/software/upgrade-scripts/120-kubernetes-service-parameters-apply.py
+++ b/software/upgrade-scripts/120-kubernetes-service-parameters-apply.py
@@ -191,7 +191,7 @@ def main():
            return ERROR
        arg += 1

-    configure_logging(LOG)
+    configure_logging()
    LOG.info(
        "%s invoked from_release = %s invoked to_release = %s action = %s"
        % (sys.argv[0], from_release, to_release, action)
--- a/software/upgrade-scripts/13-update-host-address.py
+++ b/software/upgrade-scripts/13-update-host-address.py
@@ -39,7 +39,7 @@ def main():
            return 1
        arg += 1

-    configure_logging(LOG)
+    configure_logging()

    res = 0
    LOG.info("%s invoked from_release = %s to_release = %s action = %s"
--- a/software/upgrade-scripts/18-disable-portieris-webhook.py
+++ b/software/upgrade-scripts/18-disable-portieris-webhook.py
@@ -159,7 +159,7 @@ def main():
            return ERROR
        arg += 1

-    configure_logging(LOG)
+    configure_logging()
    LOG.info(
        "%s invoked from_release = %s invoked to_release = %s action = %s"
        % (sys.argv[0], from_release, to_release, action)
--- a/software/upgrade-scripts/197-reset-config-target.py
+++ b/software/upgrade-scripts/197-reset-config-target.py
@@ -40,7 +40,7 @@ def main():
            return 1
        arg += 1

-    configure_logging(LOG)
+    configure_logging()

    LOG.debug("%s invoked with from_release = %s to_release = %s action = %s"
              % (sys.argv[0], from_release, to_release, action))
--- a/software/upgrade-scripts/198-update-isystem-data.py
+++ b/software/upgrade-scripts/198-update-isystem-data.py
@@ -40,7 +40,7 @@ def main():
            return 1
        arg += 1

-    configure_logging(LOG)
+    configure_logging()

    if action in ["activate", "activate-rollback"]:
        try:
--- a/software/upgrade-scripts/199-reconfigure-keystone-endpoints.py
+++ b/software/upgrade-scripts/199-reconfigure-keystone-endpoints.py
@@ -58,7 +58,7 @@ def main():
            return 1
        arg += 1

-    configure_logging(LOG)
+    configure_logging()

    # Activate
    if action == 'activate':
--- a/software/upgrade-scripts/20-enable-fluxcd-controllers.py
+++ b/software/upgrade-scripts/20-enable-fluxcd-controllers.py
@@ -40,7 +40,7 @@ def main():
            print("Invalid option %s." % sys.argv[arg])
            return 1
        arg += 1
-    configure_logging(LOG)
+    configure_logging()

    if action == 'activate' and from_release >= '21.12':
        LOG.info("%s invoked with from_release = %s to_release = %s "
--- a/software/upgrade-scripts/202-remove-lvm-snapshots.py
+++ b/software/upgrade-scripts/202-remove-lvm-snapshots.py
@@ -61,7 +61,7 @@ def main():
            return 1
        arg += 1

-    configure_logging(LOG)
+    configure_logging()

    LOG.info("%s invoked from_release = %s to_release = %s action = %s"
             % (sys.argv[0], from_release, to_release, action))
--- a/software/upgrade-scripts/21-k8s-app-upgrade.py
+++ b/software/upgrade-scripts/21-k8s-app-upgrade.py
@@ -126,7 +126,7 @@ def check_apps_update_progress(client, action='update'):
 def main():
    action = sys.argv[3]
    if action in ('activate', 'activate-rollback'):
-        configure_logging(LOG)
+        configure_logging()
        try:
            client = get_sysinv_client()
            update_operation_result = False
--- a/software/upgrade-scripts/22-rollback-fluxcd-controllers.py
+++ b/software/upgrade-scripts/22-rollback-fluxcd-controllers.py
@@ -243,7 +243,7 @@ def main():
            print(f"Invalid option {sys.argv[arg]}")
            return 1
        arg += 1
-    configure_logging(LOG)
+    configure_logging()

    LOG.info("%s invoked with from_release %s to_release %s and action %s",
             sys.argv[0], from_release, to_release, action)
--- a/software/upgrade-scripts/25-update-rate-limit.py
+++ b/software/upgrade-scripts/25-update-rate-limit.py
@@ -32,7 +32,7 @@ PCI_CLASS = "pci-sriov"
 DEFAULT_POSTGRES_PORT = "5432"
 LOG = logging.getLogger('main_logger')

-configure_logging(LOG)
+configure_logging()


 def get_db_credentials():
--- a/software/upgrade-scripts/26-clean-up-deployment-data.py
+++ b/software/upgrade-scripts/26-clean-up-deployment-data.py
@@ -43,7 +43,7 @@ def main():
            print("Invalid option %s." % sys.argv[arg])
            return 1
        arg += 1
-    configure_logging(LOG)
+    configure_logging()
    LOG.info(
        "%s invoked from_release = %s to_release = %s action = %s"
        % (sys.argv[0], from_release, to_release, action)
--- a/software/upgrade-scripts/27-reconfigure-ipsec.py
+++ b/software/upgrade-scripts/27-reconfigure-ipsec.py
@@ -45,7 +45,7 @@ def main():
            print("Invalid option %s." % sys.argv[arg])
            return 1
        arg += 1
-    configure_logging(LOG)
+    configure_logging()
    LOG.info(
        "%s invoked from_release = %s to_release = %s action = %s"
        % (sys.argv[0], from_release, to_release, action)