From 7df07b88b44294b6b1194a3d3765188e1691f3f5 Mon Sep 17 00:00:00 2001 From: Brian Haley Date: Wed, 27 Mar 2013 17:44:34 -0400 Subject: [PATCH] Change the quantum-ns-metadata-proxy log file name. Add a '-' before the router_id/network_id for easier parsing when starting the ns metadata proxy. Fixes bug 1161124 Change-Id: I408111d1343ecac297f6277e8067d3fa34bb8cb7 --- quantum/agent/dhcp_agent.py | 2 +- quantum/agent/l3_agent.py | 2 +- quantum/tests/unit/test_dhcp_agent.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/quantum/agent/dhcp_agent.py b/quantum/agent/dhcp_agent.py index 3ebcbcaf7..3993b56ce 100644 --- a/quantum/agent/dhcp_agent.py +++ b/quantum/agent/dhcp_agent.py @@ -318,7 +318,7 @@ class DhcpAgent(manager.Manager): '--state_path=%s' % self.conf.state_path, '--metadata_port=%d' % METADATA_PORT] proxy_cmd.extend(config.get_log_args( - cfg.CONF, 'quantum-ns-metadata-proxy%s.log' % network.id)) + cfg.CONF, 'quantum-ns-metadata-proxy-%s.log' % network.id)) return proxy_cmd pm = external_process.ProcessManager( diff --git a/quantum/agent/l3_agent.py b/quantum/agent/l3_agent.py index cda37203a..a7daa7232 100644 --- a/quantum/agent/l3_agent.py +++ b/quantum/agent/l3_agent.py @@ -260,7 +260,7 @@ class L3NATAgent(manager.Manager): '--router_id=%s' % router_info.router_id, '--state_path=%s' % self.conf.state_path] proxy_cmd.extend(config.get_log_args( - cfg.CONF, 'quantum-ns-metadata-proxy%s.log' % + cfg.CONF, 'quantum-ns-metadata-proxy-%s.log' % router_info.router_id)) return proxy_cmd diff --git a/quantum/tests/unit/test_dhcp_agent.py b/quantum/tests/unit/test_dhcp_agent.py index d051dedc4..7dd2123af 100644 --- a/quantum/tests/unit/test_dhcp_agent.py +++ b/quantum/tests/unit/test_dhcp_agent.py @@ -575,7 +575,7 @@ class TestDhcpAgentEventHandler(base.BaseTestCase): mock.ANY, mock.ANY, '--debug', - ('--log-file=quantum-ns-metadata-proxy%s.log' % + ('--log-file=quantum-ns-metadata-proxy-%s.log' % fake_meta_network.id)]) ]) finally: -- 2.45.2