openstack/octavia
Code Issues Proposed changes

Merge "Set neutron client logging to INFO"

Browse Source
This commit is contained in:
Zuul 2019-10-12 12:40:39 +00:00 committed by Gerrit Code Review
commit 95d35539bc
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
octavia/common/config.py
View File

@ -36,10 +36,13 @@ from octavia import version
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)
EXTRA_LOG_LEVEL_DEFAULTS = [
'neutronclient.v2_0.client=INFO',
]
TLS_PROTOCOL_CHOICES = [ TLS_PROTOCOL_CHOICES = [
p[9:].replace('_', '.') for p in ssl._PROTOCOL_NAMES.values()] p[9:].replace('_', '.') for p in ssl._PROTOCOL_NAMES.values()]
core_opts = [ core_opts = [
cfg.HostnameOpt('host', default=utils.get_hostname(), cfg.HostnameOpt('host', default=utils.get_hostname(),
help=_("The hostname Octavia is running on")), help=_("The hostname Octavia is running on")),
@ -765,6 +768,8 @@ def setup_logging(conf):
:param conf: a cfg.ConfOpts object :param conf: a cfg.ConfOpts object
""" """
logging.set_defaults(default_log_levels=logging.get_default_log_levels() +
EXTRA_LOG_LEVEL_DEFAULTS)
product_name = "octavia" product_name = "octavia"
logging.setup(conf, product_name) logging.setup(conf, product_name)
LOG.info("Logging enabled!") LOG.info("Logging enabled!")

2
octavia/common/service.py
View File

@ -13,7 +13,6 @@
# under the License. # under the License.
from oslo_config import cfg from oslo_config import cfg
from oslo_log import log
from octavia.common import config from octavia.common import config
from octavia.common import rpc from octavia.common import rpc
@ -23,6 +22,5 @@ def prepare_service(argv=None):
"""Sets global config from config file and sets up logging.""" """Sets global config from config file and sets up logging."""
argv = argv or [] argv = argv or []
config.init(argv[1:]) config.init(argv[1:])
log.set_defaults()
config.setup_logging(cfg.CONF) config.setup_logging(cfg.CONF)
rpc.init() rpc.init()