From 3ab6ad34ec0e498945f7031e86e45686b2df6ea5 Mon Sep 17 00:00:00 2001 From: gongysh Date: Fri, 24 May 2013 09:49:33 +0800 Subject: [PATCH] metadata proxy will use syslog as default log Bug #1183614 Change-Id: I39f07fc7d232148c50cf85fbc4ca6ca7cde8fdfa --- quantum/agent/common/config.py | 22 ++++++++++++---------- quantum/tests/unit/test_dhcp_agent.py | 2 +- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/quantum/agent/common/config.py b/quantum/agent/common/config.py index 691ff1ecd47..05a5f01bc9e 100644 --- a/quantum/agent/common/config.py +++ b/quantum/agent/common/config.py @@ -45,16 +45,18 @@ def get_log_args(conf, log_file_name): cmd_args.append('--verbose') if (conf.log_dir or conf.log_file): cmd_args.append('--log-file=%s' % log_file_name) - log_dir = None - if conf.log_dir and conf.log_file: - log_dir = os.path.dirname( - os.path.join(conf.log_dir, conf.log_file)) - elif conf.log_dir: - log_dir = conf.log_dir - elif conf.log_file: - log_dir = os.path.dirname(conf.log_file) - if log_dir: - cmd_args.append('--log-dir=%s' % log_dir) + log_dir = None + if conf.log_dir and conf.log_file: + log_dir = os.path.dirname( + os.path.join(conf.log_dir, conf.log_file)) + elif conf.log_dir: + log_dir = conf.log_dir + elif conf.log_file: + log_dir = os.path.dirname(conf.log_file) + if log_dir: + cmd_args.append('--log-dir=%s' % log_dir) + else: + cmd_args.append('--use-syslog') return cmd_args diff --git a/quantum/tests/unit/test_dhcp_agent.py b/quantum/tests/unit/test_dhcp_agent.py index 92be06c787c..cf314835845 100644 --- a/quantum/tests/unit/test_dhcp_agent.py +++ b/quantum/tests/unit/test_dhcp_agent.py @@ -362,7 +362,7 @@ class TestLogArgs(base.BaseTestCase): 'log_dir': None, 'log_file': None} conf = dhcp_agent.DictModel(conf_dict) - expected_args = ['--debug'] + expected_args = ['--debug', '--use-syslog'] args = config.get_log_args(conf, 'log_file_name') self.assertEqual(expected_args, args)