openstack/tempest
Code Issues Proposed changes

Merge "Use oslo.log library instead of system logging module"

Browse Source
This commit is contained in:
Jenkins 2017-01-16 18:22:03 +00:00 committed by Gerrit Code Review
commit 6a610504d0
7 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tempest/api/compute/volumes/test_attach_volume.py
View File

@ -13,7 +13,7 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import logging from oslo_log import log as logging
import testtools import testtools
from tempest.api.compute import base from tempest.api.compute import base

9
tempest/config.py
View File

@ -16,7 +16,6 @@
from __future__ import print_function from __future__ import print_function
import functools import functools
import logging as std_logging
import os import os
import tempfile import tempfile
@ -1199,7 +1198,7 @@ class TempestConfigPrivate(object):
register_opts() register_opts()
self._set_attrs() self._set_attrs()
if parse_conf: if parse_conf:
_CONF.log_opt_values(LOG, std_logging.DEBUG) _CONF.log_opt_values(LOG, logging.DEBUG)
class TempestConfigProxy(object): class TempestConfigProxy(object):
@ -1207,14 +1206,14 @@ class TempestConfigProxy(object):
_path = None _path = None
_extra_log_defaults = [ _extra_log_defaults = [
('paramiko.transport', std_logging.INFO), ('paramiko.transport', logging.INFO),
('requests.packages.urllib3.connectionpool', std_logging.WARN), ('requests.packages.urllib3.connectionpool', logging.WARN),
] ]
def _fix_log_levels(self): def _fix_log_levels(self):
"""Tweak the oslo log defaults.""" """Tweak the oslo log defaults."""
for name, level in self._extra_log_defaults: for name, level in self._extra_log_defaults:
std_logging.getLogger(name).setLevel(level) logging.getLogger(name).logger.setLevel(level)
def __getattr__(self, attr): def __getattr__(self, attr):
if not self._config: if not self._config:

2
tempest/lib/cli/base.py
View File

@ -13,11 +13,11 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import logging
import os import os
import shlex import shlex
import subprocess import subprocess
from oslo_log import log as logging
import six import six
from tempest.lib import base from tempest.lib import base

3
tempest/lib/cli/output_parser.py
View File

@ -15,9 +15,10 @@
"""Collection of utilities for parsing CLI clients output.""" """Collection of utilities for parsing CLI clients output."""
import logging
import re import re
from oslo_log import log as logging
from tempest.lib import exceptions from tempest.lib import exceptions

3
tempest/lib/common/rest_client.py
View File

@ -16,7 +16,6 @@
import collections import collections
import email.utils import email.utils
import logging as real_logging
import re import re
import time import time
@ -455,7 +454,7 @@ class RestClient(object):
# Also look everything at DEBUG if you want to filter this # Also look everything at DEBUG if you want to filter this
# out, don't run at debug. # out, don't run at debug.
if self.LOG.isEnabledFor(real_logging.DEBUG): if self.LOG.isEnabledFor(logging.DEBUG):
self._log_request_full(resp, req_headers, req_body, self._log_request_full(resp, req_headers, req_body,
resp_body, extra) resp_body, extra)

3
tempest/lib/services/clients.py
View File

@ -17,7 +17,8 @@
import copy import copy
import importlib import importlib
import inspect import inspect
import logging
from oslo_log import log as logging
from tempest.lib import auth from tempest.lib import auth
from tempest.lib.common.utils import misc from tempest.lib.common.utils import misc

2
tempest/test_discover/plugins.py
View File

@ -13,8 +13,8 @@
# under the License. # under the License.
import abc import abc
import logging
from oslo_log import log as logging
import six import six
import stevedore import stevedore