Merge "[MP2P] Allow logging migration to stdout" into stable/ussuri

This commit is contained in:
Zuul 2021-04-22 22:43:15 +00:00 committed by Gerrit Code Review
commit dd9311fa77
1 changed files with 11 additions and 6 deletions

View File

@ -1651,20 +1651,25 @@ def MP2Policy_migration(resource, event, trigger, **kwargs):
LOG.setLevel(logging.INFO) LOG.setLevel(logging.INFO)
start_migration_service = False start_migration_service = False
handler = logging.StreamHandler()
if kwargs.get('property'): if kwargs.get('property'):
# Add logfile
properties = admin_utils.parse_multi_keyval_opt(kwargs['property']) properties = admin_utils.parse_multi_keyval_opt(kwargs['property'])
logfile = properties.get('logfile', None) logfile = properties.get('logfile', None)
if logfile: if logfile:
f_handler = logging.FileHandler(logfile) handler = logging.FileHandler(logfile)
f_formatter = logging.Formatter(
'%(asctime)s %(levelname)s %(message)s')
f_handler.setFormatter(f_formatter)
LOG.addHandler(f_handler)
start_service_flag = properties.get('start-migration-service', 'False') start_service_flag = properties.get('start-migration-service', 'False')
if start_service_flag.lower() == 'true': if start_service_flag.lower() == 'true':
start_migration_service = 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) nsxlib = _get_nsxlib_from_config(verbose)
nsxpolicy = p_utils.get_connected_nsxpolicy( nsxpolicy = p_utils.get_connected_nsxpolicy(
conf_path=cfg.CONF.nsx_v3, verbose=verbose) conf_path=cfg.CONF.nsx_v3, verbose=verbose)