From 163d15b383ccb72ca174f71aeacf448229791849 Mon Sep 17 00:00:00 2001 From: Armando Migliaccio Date: Thu, 21 Jun 2012 21:21:17 +0100 Subject: [PATCH] Add simple file loggin to ovs_quantum_agent. Default behaviour is retained. Fix bug #1016232 Change-Id: If11244d48a5c966bbbf8786e3e9f42d205a70164 --- etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini | 2 ++ quantum/plugins/openvswitch/agent/ovs_quantum_agent.py | 9 +++++++++ quantum/plugins/openvswitch/common/config.py | 1 + 3 files changed, 12 insertions(+) diff --git a/etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini b/etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini index 349347a25..326257120 100644 --- a/etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini +++ b/etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini @@ -51,6 +51,8 @@ root_helper = sudo # integration_bridge = br-int # [AGENT] # root_helper = sudo +# Add the following setting, if you want to log to a file +# log_file = /var/log/quantum/ovs_quantum_agent.log # # 2. With tunneling. # [DATABASE] diff --git a/quantum/plugins/openvswitch/agent/ovs_quantum_agent.py b/quantum/plugins/openvswitch/agent/ovs_quantum_agent.py index 9c94f9807..a11f43e06 100755 --- a/quantum/plugins/openvswitch/agent/ovs_quantum_agent.py +++ b/quantum/plugins/openvswitch/agent/ovs_quantum_agent.py @@ -523,6 +523,15 @@ def main(): config_file = args[0] conf = config.parse(config_file) + if conf.AGENT.log_file: + # Avoid to redirect traces to stdout/stderr + logging.getLogger().handlers = [] + handler = logging.FileHandler(conf.AGENT.log_file) + formatter = logging.Formatter('%(asctime)s %(levelname)s %(message)s') + handler.setFormatter(formatter) + LOG.addHandler(handler) + LOG.debug('Verbose: %s', options.verbose) + # Determine which agent type to use. enable_tunneling = conf.OVS.enable_tunneling integ_br = conf.OVS.integration_bridge diff --git a/quantum/plugins/openvswitch/common/config.py b/quantum/plugins/openvswitch/common/config.py index c0f7680f6..88a579880 100644 --- a/quantum/plugins/openvswitch/common/config.py +++ b/quantum/plugins/openvswitch/common/config.py @@ -34,6 +34,7 @@ ovs_opts = [ agent_opts = [ cfg.IntOpt('polling_interval', default=2), cfg.StrOpt('root_helper', default='sudo'), + cfg.StrOpt('log_file', default=None), ] -- 2.45.2