openstack
/
neutron
Code Issues Proposed changes

metadata proxy will use syslog as default log 

Bug #1183614

Change-Id: I39f07fc7d232148c50cf85fbc4ca6ca7cde8fdfa
This commit is contained in:
gongysh 2013-05-24 09:49:33 +08:00
parent a87e51cebb
commit 3ab6ad34ec
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
quantum/agent/common/config.py
View File

@ -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

2
quantum/tests/unit/test_dhcp_agent.py
View File

@ -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)