diff options
author | Alec Hothan <ahothan@cisco.com> | 2018-03-20 21:44:54 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2018-03-20 21:44:54 +0000 |
commit | 0146325c7329d45a87b76931977353c06465e45e (patch) | |
tree | 4667fc0bade4aedf7677647570d6f97d31e435da | |
parent | 5cd74e4476272970d328467e37ffa164757300d7 (diff) | |
parent | 8c22b06e2c041bc17d927c67532fb69d2bd7d7b6 (diff) |
Merge "NFVBENCH-75 fluent logger configure not override by -c my_config.yaml"
-rw-r--r-- | nfvbench/nfvbench.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/nfvbench/nfvbench.py b/nfvbench/nfvbench.py index f17b51c..bf6e5d0 100644 --- a/nfvbench/nfvbench.py +++ b/nfvbench/nfvbench.py @@ -467,14 +467,6 @@ def main(): opts, unknown_opts = parse_opts_from_cli() log.set_level(debug=opts.debug) - # setup the fluent logger as soon as possible right after the config plugin is called, - # if there is any logging or result tag is set then initialize the fluent logger - for fluentd in config.fluentd: - if fluentd.logging_tag or fluentd.result_tag: - fluent_logger = FluentLogHandler(config.fluentd) - LOG.addHandler(fluent_logger) - break - if opts.version: print pbr.version.VersionInfo('nfvbench').version_string_with_vcs() sys.exit(0) @@ -506,6 +498,14 @@ def main(): LOG.info('Loading configuration string: %s', opts.config) config = config_loads(opts.config, config, whitelist_keys) + # setup the fluent logger as soon as possible right after the config plugin is called, + # if there is any logging or result tag is set then initialize the fluent logger + for fluentd in config.fluentd: + if fluentd.logging_tag or fluentd.result_tag: + fluent_logger = FluentLogHandler(config.fluentd) + LOG.addHandler(fluent_logger) + break + # traffic profile override options override_custom_traffic(config, opts.frame_sizes, opts.unidir) |