From faefd703ed9764ed73d4f25f6d8768954ae3eb8c Mon Sep 17 00:00:00 2001 From: Salvatore Orlando Date: Thu, 22 Apr 2021 09:20:46 -0700 Subject: [PATCH] [MP2P] Allow logging migration to stdout This will simplify logging when the migration is executed from a container. Change-Id: I4178c37c6fc0bbbe95298357bebbc4298757ffe0 --- .../admin/plugins/nsxv3/resources/migration.py | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/vmware_nsx/shell/admin/plugins/nsxv3/resources/migration.py b/vmware_nsx/shell/admin/plugins/nsxv3/resources/migration.py index 7e52f6d348..f64ed9d1e1 100644 --- a/vmware_nsx/shell/admin/plugins/nsxv3/resources/migration.py +++ b/vmware_nsx/shell/admin/plugins/nsxv3/resources/migration.py @@ -1651,20 +1651,25 @@ def MP2Policy_migration(resource, event, trigger, **kwargs): LOG.setLevel(logging.INFO) start_migration_service = False + handler = logging.StreamHandler() + if kwargs.get('property'): - # Add logfile properties = admin_utils.parse_multi_keyval_opt(kwargs['property']) logfile = properties.get('logfile', None) if logfile: - f_handler = logging.FileHandler(logfile) - f_formatter = logging.Formatter( - '%(asctime)s %(levelname)s %(message)s') - f_handler.setFormatter(f_formatter) - LOG.addHandler(f_handler) + handler = logging.FileHandler(logfile) + start_service_flag = properties.get('start-migration-service', 'False') if start_service_flag.lower() == 'true': start_migration_service = True + formatter = logging.Formatter('%(asctime)s %(levelname)s %(message)s') + handler.setFormatter(formatter) + LOG.addHandler(handler) + # Remove handler from root logger to avoid duplication + root_logger = logging.getLogger(None) + for root_handler in root_logger.handlers[:]: + root_logger.removeHandler(root_handler) nsxlib = _get_nsxlib_from_config(verbose) nsxpolicy = p_utils.get_connected_nsxpolicy( conf_path=cfg.CONF.nsx_v3, verbose=verbose)