diff options
| author | Ghe Rivero <ghe.rivero@hp.com> | 2015-02-19 11:50:25 -0800 |
|---|---|---|
| committer | Ghe Rivero <ghe.rivero@hp.com> | 2015-05-05 08:43:28 +0200 |
| commit | aafeed2f85be5424aef478a4c0cc12c2ca5a2d32 (patch) | |
| tree | 6c81188c104590b6939270dbc1a0429d5e4e731b /ironic | |
| parent | f1635d0cd8346b24eeab383551a2db97c4f4f9de (diff) | |
| download | ironic-aafeed2f85be5424aef478a4c0cc12c2ca5a2d32.tar.gz | |
Use oslo_log lib
Module 'log' from oslo-incubator was removed after release of oslo_log library.
Change-Id: I4261083dae076cea66c42ad16eb82a5faaeb1a65
Diffstat (limited to 'ironic')
56 files changed, 62 insertions, 822 deletions
diff --git a/ironic/api/controllers/v1/node.py b/ironic/api/controllers/v1/node.py index ce48e0916..26beaaa3f 100644 --- a/ironic/api/controllers/v1/node.py +++ b/ironic/api/controllers/v1/node.py @@ -17,6 +17,7 @@ import ast import datetime from oslo_config import cfg +from oslo_log import log from oslo_utils import strutils from oslo_utils import uuidutils import pecan @@ -35,7 +36,6 @@ from ironic.common import exception from ironic.common.i18n import _ from ironic.common import states as ir_states from ironic import objects -from ironic.openstack.common import log CONF = cfg.CONF diff --git a/ironic/api/middleware/auth_token.py b/ironic/api/middleware/auth_token.py index 053862ce6..1606a423b 100644 --- a/ironic/api/middleware/auth_token.py +++ b/ironic/api/middleware/auth_token.py @@ -15,11 +15,11 @@ import re from keystonemiddleware import auth_token +from oslo_log import log from ironic.common import exception from ironic.common.i18n import _ from ironic.common import utils -from ironic.openstack.common import log LOG = log.getLogger(__name__) diff --git a/ironic/api/middleware/parsable_error.py b/ironic/api/middleware/parsable_error.py index 42e2d6875..119e7278b 100644 --- a/ironic/api/middleware/parsable_error.py +++ b/ironic/api/middleware/parsable_error.py @@ -25,11 +25,11 @@ Based on pecan.middleware.errordocument import json from xml import etree as et +from oslo_log import log import webob from ironic.common.i18n import _ from ironic.common.i18n import _LE -from ironic.openstack.common import log LOG = log.getLogger(__name__) diff --git a/ironic/cmd/api.py b/ironic/cmd/api.py index 32fdd6385..71084c477 100644 --- a/ironic/cmd/api.py +++ b/ironic/cmd/api.py @@ -22,12 +22,12 @@ import sys from wsgiref import simple_server from oslo_config import cfg +from oslo_log import log from six.moves import socketserver from ironic.api import app from ironic.common.i18n import _LI from ironic.common import service as ironic_service -from ironic.openstack.common import log CONF = cfg.CONF diff --git a/ironic/common/disk_partitioner.py b/ironic/common/disk_partitioner.py index 4d334e475..43a73f7af 100644 --- a/ironic/common/disk_partitioner.py +++ b/ironic/common/disk_partitioner.py @@ -17,12 +17,12 @@ import re from oslo_concurrency import processutils from oslo_config import cfg +from oslo_log import log as logging from ironic.common import exception from ironic.common.i18n import _ from ironic.common.i18n import _LW from ironic.common import utils -from ironic.openstack.common import log as logging from ironic.openstack.common import loopingcall opts = [ diff --git a/ironic/common/driver_factory.py b/ironic/common/driver_factory.py index e3250143d..89bb03fe8 100644 --- a/ironic/common/driver_factory.py +++ b/ironic/common/driver_factory.py @@ -15,11 +15,11 @@ from oslo_concurrency import lockutils from oslo_config import cfg +from oslo_log import log from stevedore import dispatch from ironic.common import exception from ironic.common.i18n import _LI -from ironic.openstack.common import log LOG = log.getLogger(__name__) diff --git a/ironic/common/exception.py b/ironic/common/exception.py index ea3ee8fc4..8be37ec12 100644 --- a/ironic/common/exception.py +++ b/ironic/common/exception.py @@ -23,11 +23,11 @@ SHOULD include dedicated exception logging. """ from oslo_config import cfg +from oslo_log import log as logging import six from ironic.common.i18n import _ from ironic.common.i18n import _LE -from ironic.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/ironic/common/image_service.py b/ironic/common/image_service.py index e4bef4ae3..428f971f1 100644 --- a/ironic/common/image_service.py +++ b/ironic/common/image_service.py @@ -20,6 +20,7 @@ import os import shutil from oslo_config import cfg +from oslo_log import log as logging from oslo_utils import importutils import requests import sendfile @@ -28,7 +29,6 @@ import six.moves.urllib.parse as urlparse from ironic.common import exception from ironic.common.i18n import _ -from ironic.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/ironic/common/images.py b/ironic/common/images.py index 7598fb656..57f65ac7b 100644 --- a/ironic/common/images.py +++ b/ironic/common/images.py @@ -25,6 +25,7 @@ import shutil import jinja2 from oslo_concurrency import processutils from oslo_config import cfg +from oslo_log import log as logging from ironic.common import exception from ironic.common.glance_service import service_utils as glance_utils @@ -35,7 +36,6 @@ from ironic.common import paths from ironic.common import utils from ironic.openstack.common import fileutils from ironic.openstack.common import imageutils -from ironic.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/ironic/common/pxe_utils.py b/ironic/common/pxe_utils.py index 09528a218..3791f96ee 100644 --- a/ironic/common/pxe_utils.py +++ b/ironic/common/pxe_utils.py @@ -18,6 +18,7 @@ import os import jinja2 from oslo_config import cfg +from oslo_log import log as logging from ironic.common import dhcp_factory from ironic.common import exception @@ -26,7 +27,6 @@ from ironic.common import utils from ironic.drivers.modules import deploy_utils from ironic.drivers import utils as driver_utils from ironic.openstack.common import fileutils -from ironic.openstack.common import log as logging CONF = cfg.CONF diff --git a/ironic/common/service.py b/ironic/common/service.py index 55d9ffd42..b68bfd24d 100644 --- a/ironic/common/service.py +++ b/ironic/common/service.py @@ -22,6 +22,7 @@ import socket from oslo import messaging from oslo_config import cfg from oslo_context import context +from oslo_log import log from oslo_utils import importutils from ironic.common import config @@ -29,7 +30,6 @@ from ironic.common.i18n import _LE from ironic.common.i18n import _LI from ironic.common import rpc from ironic.objects import base as objects_base -from ironic.openstack.common import log from ironic.openstack.common import service @@ -118,9 +118,8 @@ class RPCService(service.Service): def prepare_service(argv=[]): - config.parse_args(argv) - cfg.set_defaults(log.log_opts, - default_log_levels=['amqp=WARN', + log.register_options(cfg.CONF) + log.set_defaults(default_log_levels=['amqp=WARN', 'amqplib=WARN', 'qpid.messaging=INFO', 'oslo.messaging=INFO', @@ -136,4 +135,5 @@ def prepare_service(argv=[]): 'ironic.openstack.common=WARN', 'urllib3.connectionpool=WARN', ]) - log.setup('ironic') + config.parse_args(argv) + log.setup(cfg.CONF, 'ironic') diff --git a/ironic/common/states.py b/ironic/common/states.py index ab9684f32..6c7e40e0c 100644 --- a/ironic/common/states.py +++ b/ironic/common/states.py @@ -28,8 +28,9 @@ the state leaves the current state unchanged. The node is NOT placed into maintenance mode in this case. """ +from oslo_log import log as logging + from ironic.common import fsm -from ironic.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/ironic/common/swift.py b/ironic/common/swift.py index a4444e29f..597c29114 100644 --- a/ironic/common/swift.py +++ b/ironic/common/swift.py @@ -15,6 +15,7 @@ # under the License. from oslo_config import cfg +from oslo_log import log as logging from six.moves.urllib import parse from swiftclient import client as swift_client from swiftclient import exceptions as swift_exceptions @@ -23,7 +24,6 @@ from swiftclient import utils as swift_utils from ironic.common import exception from ironic.common.i18n import _ from ironic.common import keystone -from ironic.openstack.common import log as logging swift_opts = [ cfg.IntOpt('swift_max_retries', diff --git a/ironic/common/utils.py b/ironic/common/utils.py index 3633f826c..b4bffefad 100644 --- a/ironic/common/utils.py +++ b/ironic/common/utils.py @@ -30,6 +30,7 @@ import tempfile import netaddr from oslo_concurrency import processutils from oslo_config import cfg +from oslo_log import log as logging from oslo_utils import excutils import paramiko import six @@ -38,7 +39,6 @@ from ironic.common import exception from ironic.common.i18n import _ from ironic.common.i18n import _LE from ironic.common.i18n import _LW -from ironic.openstack.common import log as logging utils_opts = [ cfg.StrOpt('rootwrap_config', diff --git a/ironic/conductor/manager.py b/ironic/conductor/manager.py index 64eda5e67..a71821ee7 100644 --- a/ironic/conductor/manager.py +++ b/ironic/conductor/manager.py @@ -54,6 +54,7 @@ from oslo_concurrency import lockutils from oslo_config import cfg from oslo_context import context as ironic_context from oslo_db import exception as db_exception +from oslo_log import log from oslo_utils import excutils from oslo_utils import uuidutils @@ -76,7 +77,6 @@ from ironic.conductor import task_manager from ironic.conductor import utils from ironic.db import api as dbapi from ironic import objects -from ironic.openstack.common import log from ironic.openstack.common import periodic_task MANAGER_TOPIC = 'ironic.conductor_manager' diff --git a/ironic/conductor/task_manager.py b/ironic/conductor/task_manager.py index 3a4cb8cd7..74b0bca9e 100644 --- a/ironic/conductor/task_manager.py +++ b/ironic/conductor/task_manager.py @@ -97,6 +97,7 @@ raised in the background thread.): import functools from oslo_config import cfg +from oslo_log import log as logging from oslo_utils import excutils import retrying @@ -105,7 +106,6 @@ from ironic.common import exception from ironic.common.i18n import _LW from ironic.common import states from ironic import objects -from ironic.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/ironic/conductor/utils.py b/ironic/conductor/utils.py index fc9b0a44c..eba7bb3fe 100644 --- a/ironic/conductor/utils.py +++ b/ironic/conductor/utils.py @@ -12,6 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. +from oslo_log import log from oslo_utils import excutils from ironic.common import exception @@ -20,7 +21,6 @@ from ironic.common.i18n import _LI from ironic.common.i18n import _LW from ironic.common import states from ironic.conductor import task_manager -from ironic.openstack.common import log LOG = log.getLogger(__name__) diff --git a/ironic/db/sqlalchemy/api.py b/ironic/db/sqlalchemy/api.py index 7af567e1f..27b515345 100644 --- a/ironic/db/sqlalchemy/api.py +++ b/ironic/db/sqlalchemy/api.py @@ -23,6 +23,7 @@ from oslo_config import cfg from oslo_db import exception as db_exc from oslo_db.sqlalchemy import session as db_session from oslo_db.sqlalchemy import utils as db_utils +from oslo_log import log from oslo_utils import strutils from oslo_utils import timeutils from oslo_utils import uuidutils @@ -35,7 +36,6 @@ from ironic.common import states from ironic.common import utils from ironic.db import api from ironic.db.sqlalchemy import models -from ironic.openstack.common import log CONF = cfg.CONF CONF.import_opt('heartbeat_timeout', diff --git a/ironic/dhcp/neutron.py b/ironic/dhcp/neutron.py index c4ee54342..60963ea90 100644 --- a/ironic/dhcp/neutron.py +++ b/ironic/dhcp/neutron.py @@ -19,6 +19,7 @@ import time from neutronclient.common import exceptions as neutron_client_exc from neutronclient.v2_0 import client as clientv20 from oslo_config import cfg +from oslo_log import log as logging from oslo_utils import netutils from ironic.common import exception @@ -29,7 +30,6 @@ from ironic.common import keystone from ironic.common import network from ironic.dhcp import base from ironic.drivers.modules import ssh -from ironic.openstack.common import log as logging neutron_opts = [ diff --git a/ironic/drivers/base.py b/ironic/drivers/base.py index e0685d0e4..60ec5367e 100644 --- a/ironic/drivers/base.py +++ b/ironic/drivers/base.py @@ -24,12 +24,12 @@ import functools import inspect import eventlet +from oslo_log import log as logging from oslo_utils import excutils import six from ironic.common import exception from ironic.common.i18n import _LE -from ironic.openstack.common import log as logging from ironic.openstack.common import periodic_task LOG = logging.getLogger(__name__) diff --git a/ironic/drivers/modules/agent.py b/ironic/drivers/modules/agent.py index 6a590c8c4..d6cf23c44 100644 --- a/ironic/drivers/modules/agent.py +++ b/ironic/drivers/modules/agent.py @@ -16,6 +16,7 @@ import os import time from oslo_config import cfg +from oslo_log import log from oslo_utils import excutils from ironic.common import boot_devices @@ -38,7 +39,6 @@ from ironic.drivers.modules import agent_client from ironic.drivers.modules import deploy_utils from ironic.drivers.modules import image_cache from ironic.openstack.common import fileutils -from ironic.openstack.common import log agent_opts = [ diff --git a/ironic/drivers/modules/agent_base_vendor.py b/ironic/drivers/modules/agent_base_vendor.py index 539d1f06b..5d2fe5380 100644 --- a/ironic/drivers/modules/agent_base_vendor.py +++ b/ironic/drivers/modules/agent_base_vendor.py @@ -20,6 +20,7 @@ import time from oslo_config import cfg +from oslo_log import log from oslo_utils import excutils from ironic.common import boot_devices @@ -37,7 +38,6 @@ from ironic.drivers import base from ironic.drivers.modules import agent_client from ironic.drivers.modules import deploy_utils from ironic import objects -from ironic.openstack.common import log agent_opts = [ cfg.IntOpt('heartbeat_timeout', diff --git a/ironic/drivers/modules/agent_client.py b/ironic/drivers/modules/agent_client.py index 4130a27ab..87905a01a 100644 --- a/ironic/drivers/modules/agent_client.py +++ b/ironic/drivers/modules/agent_client.py @@ -13,12 +13,12 @@ # limitations under the License. from oslo_config import cfg +from oslo_log import log from oslo_serialization import jsonutils import requests from ironic.common import exception from ironic.common.i18n import _ -from ironic.openstack.common import log agent_opts = [ cfg.StrOpt('agent_api_version', diff --git a/ironic/drivers/modules/amt/common.py b/ironic/drivers/modules/amt/common.py index f85a29ea2..9cacb31e3 100644 --- a/ironic/drivers/modules/amt/common.py +++ b/ironic/drivers/modules/amt/common.py @@ -17,6 +17,7 @@ Common functionalities for AMT Driver from xml.etree import ElementTree from oslo_config import cfg +from oslo_log import log as logging from oslo_utils import importutils import six @@ -24,7 +25,6 @@ from ironic.common import boot_devices from ironic.common import exception from ironic.common.i18n import _ from ironic.common.i18n import _LE -from ironic.openstack.common import log as logging pywsman = importutils.try_import('pywsman') diff --git a/ironic/drivers/modules/amt/management.py b/ironic/drivers/modules/amt/management.py index 0566da4eb..b82f52768 100644 --- a/ironic/drivers/modules/amt/management.py +++ b/ironic/drivers/modules/amt/management.py @@ -16,6 +16,7 @@ AMT Management Driver """ import copy +from oslo_log import log as logging from oslo_utils import excutils from oslo_utils import importutils @@ -27,7 +28,6 @@ from ironic.conductor import task_manager from ironic.drivers import base from ironic.drivers.modules.amt import common as amt_common from ironic.drivers.modules.amt import resource_uris -from ironic.openstack.common import log as logging pywsman = importutils.try_import('pywsman') diff --git a/ironic/drivers/modules/amt/power.py b/ironic/drivers/modules/amt/power.py index 1ef96258a..984029981 100644 --- a/ironic/drivers/modules/amt/power.py +++ b/ironic/drivers/modules/amt/power.py @@ -17,6 +17,7 @@ AMT Power Driver import copy from oslo_config import cfg +from oslo_log import log as logging from oslo_utils import excutils from oslo_utils import importutils @@ -30,7 +31,6 @@ from ironic.conductor import task_manager from ironic.drivers import base from ironic.drivers.modules.amt import common as amt_common from ironic.drivers.modules.amt import resource_uris -from ironic.openstack.common import log as logging from ironic.openstack.common import loopingcall pywsman = importutils.try_import('pywsman') diff --git a/ironic/drivers/modules/console_utils.py b/ironic/drivers/modules/console_utils.py index b6d5ca055..1cea936a3 100644 --- a/ironic/drivers/modules/console_utils.py +++ b/ironic/drivers/modules/console_utils.py @@ -26,13 +26,13 @@ import time from oslo_concurrency import processutils from oslo_config import cfg +from oslo_log import log as logging from oslo_utils import netutils from ironic.common import exception from ironic.common.i18n import _ from ironic.common.i18n import _LW from ironic.common import utils -from ironic.openstack.common import log as logging from ironic.openstack.common import loopingcall diff --git a/ironic/drivers/modules/deploy_utils.py b/ironic/drivers/modules/deploy_utils.py index e6c2c48ef..1a2410281 100644 --- a/ironic/drivers/modules/deploy_utils.py +++ b/ironic/drivers/modules/deploy_utils.py @@ -28,6 +28,7 @@ import time from oslo_concurrency import processutils from oslo_config import cfg +from oslo_log import log as logging from oslo_serialization import jsonutils from oslo_utils import excutils from oslo_utils import units @@ -48,7 +49,6 @@ from ironic.drivers.modules import agent_client from ironic.drivers.modules import image_cache from ironic.drivers import utils as driver_utils from ironic import objects -from ironic.openstack.common import log as logging deploy_opts = [ diff --git a/ironic/drivers/modules/discoverd.py b/ironic/drivers/modules/discoverd.py index 9e2f8cb25..1fc756fb7 100644 --- a/ironic/drivers/modules/discoverd.py +++ b/ironic/drivers/modules/discoverd.py @@ -17,6 +17,7 @@ Modules required to work with ironic_discoverd: import eventlet from oslo_config import cfg +from oslo_log import log as logging from oslo_utils import importutils from ironic.common import exception @@ -27,7 +28,6 @@ from ironic.common import keystone from ironic.common import states from ironic.conductor import task_manager from ironic.drivers import base -from ironic.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/ironic/drivers/modules/drac/client.py b/ironic/drivers/modules/drac/client.py index 3b40bd8d6..a2b23b8ab 100644 --- a/ironic/drivers/modules/drac/client.py +++ b/ironic/drivers/modules/drac/client.py @@ -18,12 +18,12 @@ Wrapper for pywsman.Client import time from xml.etree import ElementTree +from oslo_log import log as logging from oslo_utils import importutils from ironic.common import exception from ironic.common.i18n import _LW from ironic.drivers.modules.drac import common as drac_common -from ironic.openstack.common import log as logging pywsman = importutils.try_import('pywsman') diff --git a/ironic/drivers/modules/drac/management.py b/ironic/drivers/modules/drac/management.py index f5c5a890f..3451147d2 100644 --- a/ironic/drivers/modules/drac/management.py +++ b/ironic/drivers/modules/drac/management.py @@ -19,6 +19,7 @@ DRAC Management Driver """ +from oslo_log import log as logging from oslo_utils import excutils from oslo_utils import importutils @@ -30,7 +31,6 @@ from ironic.drivers import base from ironic.drivers.modules.drac import client as drac_client from ironic.drivers.modules.drac import common as drac_common from ironic.drivers.modules.drac import resource_uris -from ironic.openstack.common import log as logging pywsman = importutils.try_import('pywsman') diff --git a/ironic/drivers/modules/drac/power.py b/ironic/drivers/modules/drac/power.py index 1ea374234..c59986fda 100644 --- a/ironic/drivers/modules/drac/power.py +++ b/ironic/drivers/modules/drac/power.py @@ -15,6 +15,7 @@ DRAC Power Driver using the Base Server Profile """ +from oslo_log import log as logging from oslo_utils import excutils from oslo_utils import importutils @@ -26,7 +27,6 @@ from ironic.drivers import base from ironic.drivers.modules.drac import client as drac_client from ironic.drivers.modules.drac import common as drac_common from ironic.drivers.modules.drac import resource_uris -from ironic.openstack.common import log as logging pywsman = importutils.try_import('pywsman') diff --git a/ironic/drivers/modules/iboot.py b/ironic/drivers/modules/iboot.py index dfcd15736..04331fbea 100644 --- a/ironic/drivers/modules/iboot.py +++ b/ironic/drivers/modules/iboot.py @@ -19,6 +19,7 @@ Ironic iBoot PDU power manager. """ +from oslo_log import log as logging from oslo_utils import importutils from ironic.common import exception @@ -27,7 +28,6 @@ from ironic.common.i18n import _LW from ironic.common import states from ironic.conductor import task_manager from ironic.drivers import base -from ironic.openstack.common import log as logging iboot = importutils.try_import('iboot') diff --git a/ironic/drivers/modules/ilo/common.py b/ironic/drivers/modules/ilo/common.py index 1d1363d0d..0e727123a 100644 --- a/ironic/drivers/modules/ilo/common.py +++ b/ironic/drivers/modules/ilo/common.py @@ -19,6 +19,7 @@ Common functionalities shared between different iLO modules. import tempfile from oslo_config import cfg +from oslo_log import log as logging from oslo_utils import importutils import six.moves.urllib.parse as urlparse @@ -31,7 +32,6 @@ from ironic.common import images from ironic.common import swift from ironic.common import utils from ironic.drivers.modules import deploy_utils -from ironic.openstack.common import log as logging ilo_client = importutils.try_import('proliantutils.ilo.client') ilo_error = importutils.try_import('proliantutils.exception') diff --git a/ironic/drivers/modules/ilo/deploy.py b/ironic/drivers/modules/ilo/deploy.py index 5f901184e..1a4e0df6e 100644 --- a/ironic/drivers/modules/ilo/deploy.py +++ b/ironic/drivers/modules/ilo/deploy.py @@ -18,6 +18,7 @@ iLO Deploy Driver(s) and supporting methods. import tempfile from oslo_config import cfg +from oslo_log import log as logging from oslo_utils import excutils from ironic.common import boot_devices @@ -44,7 +45,6 @@ from ironic.drivers.modules import ipmitool from ironic.drivers.modules import iscsi_deploy from ironic.drivers.modules import pxe from ironic.drivers import utils as driver_utils -from ironic.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/ironic/drivers/modules/ilo/inspect.py b/ironic/drivers/modules/ilo/inspect.py index 459e34bfe..7efc78477 100644 --- a/ironic/drivers/modules/ilo/inspect.py +++ b/ironic/drivers/modules/ilo/inspect.py @@ -12,6 +12,7 @@ """ iLO Inspect Interface """ +from oslo_log import log as logging from oslo_utils import importutils import six @@ -24,7 +25,6 @@ from ironic.conductor import utils as conductor_utils from ironic.db import api as dbapi from ironic.drivers import base from ironic.drivers.modules.ilo import common as ilo_common -from ironic.openstack.common import log as logging ilo_error = importutils.try_import('proliantutils.exception') diff --git a/ironic/drivers/modules/ilo/management.py b/ironic/drivers/modules/ilo/management.py index 5c56776d2..4e7260c83 100644 --- a/ironic/drivers/modules/ilo/management.py +++ b/ironic/drivers/modules/ilo/management.py @@ -16,6 +16,7 @@ iLO Management Interface """ from oslo_config import cfg +from oslo_log import log as logging from oslo_utils import importutils from ironic.common import boot_devices @@ -27,7 +28,6 @@ from ironic.conductor import task_manager from ironic.drivers import base from ironic.drivers.modules.ilo import common as ilo_common from ironic.drivers.modules import ipmitool -from ironic.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/ironic/drivers/modules/ilo/power.py b/ironic/drivers/modules/ilo/power.py index 8b2760118..1e3a2543a 100644 --- a/ironic/drivers/modules/ilo/power.py +++ b/ironic/drivers/modules/ilo/power.py @@ -17,6 +17,7 @@ iLO Power Driver """ from oslo_config import cfg +from oslo_log import log as logging from oslo_utils import importutils from ironic.common import boot_devices @@ -28,7 +29,6 @@ from ironic.conductor import task_manager from ironic.conductor import utils as manager_utils from ironic.drivers import base from ironic.drivers.modules.ilo import common as ilo_common -from ironic.openstack.common import log as logging from ironic.openstack.common import loopingcall ilo_error = importutils.try_import('proliantutils.exception') diff --git a/ironic/drivers/modules/image_cache.py b/ironic/drivers/modules/image_cache.py index d7b27c0fe..618ae25d8 100644 --- a/ironic/drivers/modules/image_cache.py +++ b/ironic/drivers/modules/image_cache.py @@ -25,6 +25,7 @@ import uuid from oslo_concurrency import lockutils from oslo_config import cfg +from oslo_log import log as logging from ironic.common import exception from ironic.common.glance_service import service_utils @@ -33,7 +34,6 @@ from ironic.common.i18n import _LW from ironic.common import images from ironic.common import utils from ironic.openstack.common import fileutils -from ironic.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/ironic/drivers/modules/ipminative.py b/ironic/drivers/modules/ipminative.py index 01ae0532c..4fbf74fff 100644 --- a/ironic/drivers/modules/ipminative.py +++ b/ironic/drivers/modules/ipminative.py @@ -23,6 +23,7 @@ import os import tempfile from oslo_config import cfg +from oslo_log import log as logging from oslo_utils import excutils from oslo_utils import importutils @@ -36,7 +37,6 @@ from ironic.common import utils from ironic.conductor import task_manager from ironic.drivers import base from ironic.drivers.modules import console_utils -from ironic.openstack.common import log as logging pyghmi = importutils.try_import('pyghmi') if pyghmi: diff --git a/ironic/drivers/modules/ipmitool.py b/ironic/drivers/modules/ipmitool.py index ddebd68ef..6b30fc573 100644 --- a/ironic/drivers/modules/ipmitool.py +++ b/ironic/drivers/modules/ipmitool.py @@ -37,6 +37,7 @@ import time from oslo_concurrency import processutils from oslo_config import cfg +from oslo_log import log as logging from oslo_utils import excutils from ironic.common import boot_devices @@ -49,7 +50,6 @@ from ironic.common import utils from ironic.conductor import task_manager from ironic.drivers import base from ironic.drivers.modules import console_utils -from ironic.openstack.common import log as logging from ironic.openstack.common import loopingcall diff --git a/ironic/drivers/modules/irmc/common.py b/ironic/drivers/modules/irmc/common.py index 59a478f91..f45f40b90 100644 --- a/ironic/drivers/modules/irmc/common.py +++ b/ironic/drivers/modules/irmc/common.py @@ -16,11 +16,11 @@ Common functionalities shared between different iRMC modules. """ from oslo_config import cfg +from oslo_log import log as logging from oslo_utils import importutils from ironic.common import exception from ironic.common.i18n import _ -from ironic.openstack.common import log as logging scci = importutils.try_import('scciclient.irmc.scci') diff --git a/ironic/drivers/modules/irmc/management.py b/ironic/drivers/modules/irmc/management.py index f0359072b..cbb3412b4 100644 --- a/ironic/drivers/modules/irmc/management.py +++ b/ironic/drivers/modules/irmc/management.py @@ -14,6 +14,7 @@ iRMC Management Driver """ +from oslo_log import log as logging from oslo_utils import importutils from ironic.common import boot_devices @@ -24,7 +25,6 @@ from ironic.conductor import task_manager from ironic.drivers.modules import ipmitool from ironic.drivers.modules.irmc import common as irmc_common from ironic.drivers import utils as driver_utils -from ironic.openstack.common import log as logging scci = importutils.try_import('scciclient.irmc.scci') diff --git a/ironic/drivers/modules/irmc/power.py b/ironic/drivers/modules/irmc/power.py index d60a5d1bc..4b4ecf90b 100644 --- a/ironic/drivers/modules/irmc/power.py +++ b/ironic/drivers/modules/irmc/power.py @@ -15,6 +15,7 @@ iRMC Power Driver using the Base Server Profile """ from oslo_config import cfg +from oslo_log import log as logging from oslo_utils import importutils from ironic.common import exception @@ -25,7 +26,6 @@ from ironic.conductor import task_manager from ironic.drivers import base from ironic.drivers.modules import ipmitool from ironic.drivers.modules.irmc import common as irmc_common -from ironic.openstack.common import log as logging scci = importutils.try_import('scciclient.irmc.scci') diff --git a/ironic/drivers/modules/iscsi_deploy.py b/ironic/drivers/modules/iscsi_deploy.py index 04c2fda2f..f380d69c1 100644 --- a/ironic/drivers/modules/iscsi_deploy.py +++ b/ironic/drivers/modules/iscsi_deploy.py @@ -16,6 +16,7 @@ import os from oslo_config import cfg +from oslo_log import log as logging from oslo_utils import strutils from six.moves.urllib import parse @@ -33,7 +34,6 @@ from ironic.drivers.modules import deploy_utils from ironic.drivers.modules import image_cache from ironic.drivers import utils as driver_utils from ironic.openstack.common import fileutils -from ironic.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/ironic/drivers/modules/pxe.py b/ironic/drivers/modules/pxe.py index 5401145a3..9835e774a 100644 --- a/ironic/drivers/modules/pxe.py +++ b/ironic/drivers/modules/pxe.py @@ -21,6 +21,7 @@ import os import shutil from oslo_config import cfg +from oslo_log import log as logging from ironic.common import boot_devices from ironic.common import dhcp_factory @@ -45,7 +46,6 @@ from ironic.drivers.modules import image_cache from ironic.drivers.modules import iscsi_deploy from ironic.drivers import utils as driver_utils from ironic.openstack.common import fileutils -from ironic.openstack.common import log as logging pxe_opts = [ diff --git a/ironic/drivers/modules/seamicro.py b/ironic/drivers/modules/seamicro.py index c8eeffc36..07db200f2 100644 --- a/ironic/drivers/modules/seamicro.py +++ b/ironic/drivers/modules/seamicro.py @@ -22,6 +22,7 @@ import os import re from oslo_config import cfg +from oslo_log import log as logging from oslo_utils import importutils from six.moves.urllib import parse as urlparse @@ -34,7 +35,6 @@ from ironic.common import states from ironic.conductor import task_manager from ironic.drivers import base from ironic.drivers.modules import console_utils -from ironic.openstack.common import log as logging from ironic.openstack.common import loopingcall seamicroclient = importutils.try_import('seamicroclient') diff --git a/ironic/drivers/modules/snmp.py b/ironic/drivers/modules/snmp.py index 7a252c691..3772e8d8a 100644 --- a/ironic/drivers/modules/snmp.py +++ b/ironic/drivers/modules/snmp.py @@ -30,6 +30,7 @@ models. import abc from oslo_config import cfg +from oslo_log import log as logging from oslo_utils import importutils import six @@ -39,7 +40,6 @@ from ironic.common.i18n import _LW from ironic.common import states from ironic.conductor import task_manager from ironic.drivers import base -from ironic.openstack.common import log as logging from ironic.openstack.common import loopingcall pysnmp = importutils.try_import('pysnmp') diff --git a/ironic/drivers/modules/ssh.py b/ironic/drivers/modules/ssh.py index c129a580d..7f86b9619 100644 --- a/ironic/drivers/modules/ssh.py +++ b/ironic/drivers/modules/ssh.py @@ -30,6 +30,7 @@ import os from oslo_concurrency import processutils from oslo_config import cfg +from oslo_log import log as logging from ironic.common import boot_devices from ironic.common import exception @@ -41,7 +42,6 @@ from ironic.common import utils from ironic.conductor import task_manager from ironic.drivers import base from ironic.drivers import utils as driver_utils -from ironic.openstack.common import log as logging libvirt_opts = [ cfg.StrOpt('libvirt_uri', diff --git a/ironic/drivers/modules/virtualbox.py b/ironic/drivers/modules/virtualbox.py index 7fe656504..19f6eb6a8 100644 --- a/ironic/drivers/modules/virtualbox.py +++ b/ironic/drivers/modules/virtualbox.py @@ -15,6 +15,7 @@ VirtualBox Driver Modules """ from oslo_config import cfg +from oslo_log import log as logging from oslo_utils import importutils from ironic.common import boot_devices @@ -24,7 +25,6 @@ from ironic.common.i18n import _LE from ironic.common import states from ironic.conductor import task_manager from ironic.drivers import base -from ironic.openstack.common import log as logging pyremotevbox = importutils.try_import('pyremotevbox') if pyremotevbox: diff --git a/ironic/drivers/utils.py b/ironic/drivers/utils.py index 7caa6cabe..4f167d718 100644 --- a/ironic/drivers/utils.py +++ b/ironic/drivers/utils.py @@ -12,11 +12,12 @@ # License for the specific language governing permissions and limitations # under the License. +from oslo_log import log as logging + from ironic.common import exception from ironic.common.i18n import _ from ironic.common.i18n import _LW from ironic.drivers import base -from ironic.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/ironic/objects/base.py b/ironic/objects/base.py index bd3cc63d3..97f4b0207 100644 --- a/ironic/objects/base.py +++ b/ironic/objects/base.py @@ -19,13 +19,13 @@ import copy from oslo import messaging from oslo_context import context +from oslo_log import log as logging import six from ironic.common import exception from ironic.common.i18n import _ from ironic.common.i18n import _LE from ironic.objects import utils as obj_utils -from ironic.openstack.common import log as logging from ironic.openstack.common import versionutils diff --git a/ironic/openstack/common/local.py b/ironic/openstack/common/local.py deleted file mode 100644 index 0819d5b97..000000000 --- a/ironic/openstack/common/local.py +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 2011 OpenStack Foundation. -# All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -"""Local storage of variables using weak references""" - -import threading -import weakref - - -class WeakLocal(threading.local): - def __getattribute__(self, attr): - rval = super(WeakLocal, self).__getattribute__(attr) - if rval: - # NOTE(mikal): this bit is confusing. What is stored is a weak - # reference, not the value itself. We therefore need to lookup - # the weak reference and return the inner value here. - rval = rval() - return rval - - def __setattr__(self, attr, value): - value = weakref.ref(value) - return super(WeakLocal, self).__setattr__(attr, value) - - -# NOTE(mikal): the name "store" should be deprecated in the future -store = WeakLocal() - -# A "weak" store uses weak references and allows an object to fall out of scope -# when it falls out of scope in the code that uses the thread local storage. A -# "strong" store will hold a reference to the object so that it never falls out -# of scope. -weak_store = WeakLocal() -strong_store = threading.local() diff --git a/ironic/openstack/common/log.py b/ironic/openstack/common/log.py deleted file mode 100644 index 5bf73f263..000000000 --- a/ironic/openstack/common/log.py +++ /dev/null @@ -1,718 +0,0 @@ -# Copyright 2011 OpenStack Foundation. -# Copyright 2010 United States Government as represented by the -# Administrator of the National Aeronautics and Space Administration. -# All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -"""OpenStack logging handler. - -This module adds to logging functionality by adding the option to specify -a context object when calling the various log methods. If the context object -is not specified, default formatting is used. Additionally, an instance uuid -may be passed as part of the log message, which is intended to make it easier -for admins to find messages related to a specific instance. - -It also allows setting of formatting information through conf. - -""" - -import copy -import inspect -import itertools -import logging -import logging.config -import logging.handlers -import os -import socket -import sys -import traceback - -from oslo.config import cfg -from oslo_serialization import jsonutils -from oslo.utils import importutils -import six -from six import moves - -_PY26 = sys.version_info[0:2] == (2, 6) - -from ironic.openstack.common._i18n import _ -from ironic.openstack.common import local - - -_DEFAULT_LOG_DATE_FORMAT = "%Y-%m-%d %H:%M:%S" - - -common_cli_opts = [ - cfg.BoolOpt('debug', - short='d', - default=False, - help='Print debugging output (set logging level to ' - 'DEBUG instead of default WARNING level).'), - cfg.BoolOpt('verbose', - short='v', - default=False, - help='Print more verbose output (set logging level to ' - 'INFO instead of default WARNING level).'), -] - -logging_cli_opts = [ - cfg.StrOpt('log-config-append', - metavar='PATH', - deprecated_name='log-config', - help='The name of a logging configuration file. This file ' - 'is appended to any existing logging configuration ' - 'files. For details about logging configuration files, ' - 'see the Python logging module documentation.'), - cfg.StrOpt('log-format', - metavar='FORMAT', - help='DEPRECATED. ' - 'A logging.Formatter log message format string which may ' - 'use any of the available logging.LogRecord attributes. ' - 'This option is deprecated. Please use ' - 'logging_context_format_string and ' - 'logging_default_format_string instead.'), - cfg.StrOpt('log-date-format', - default=_DEFAULT_LOG_DATE_FORMAT, - metavar='DATE_FORMAT', - help='Format string for %%(asctime)s in log records. ' - 'Default: %(default)s .'), - cfg.StrOpt('log-file', - metavar='PATH', - deprecated_name='logfile', - help='(Optional) Name of log file to output to. ' - 'If no default is set, logging will go to stdout.'), - cfg.StrOpt('log-dir', - deprecated_name='logdir', - help='(Optional) The base directory used for relative ' - '--log-file paths.'), - cfg.BoolOpt('use-syslog', - default=False, - help='Use syslog for logging. ' - 'Existing syslog format is DEPRECATED during I, ' - 'and will change in J to honor RFC5424.'), - cfg.BoolOpt('use-syslog-rfc-format', - # TODO(bogdando) remove or use True after existing - # syslog format deprecation in J - default=False, - help='(Optional) Enables or disables syslog rfc5424 format ' - 'for logging. If enabled, prefixes the MSG part of the ' - 'syslog message with APP-NAME (RFC5424). The ' - 'format without the APP-NAME is deprecated in I, ' - 'and will be removed in J.'), - cfg.StrOpt('syslog-log-facility', - default='LOG_USER', - help='Syslog facility to receive log lines.') -] - -generic_log_opts = [ - cfg.BoolOpt('use_stderr', - default=True, - help='Log output to standard error.') -] - -DEFAULT_LOG_LEVELS = ['amqp=WARN', 'amqplib=WARN', 'boto=WARN', - 'qpid=WARN', 'sqlalchemy=WARN', 'suds=INFO', - 'oslo.messaging=INFO', 'iso8601=WARN', - 'requests.packages.urllib3.connectionpool=WARN', - 'urllib3.connectionpool=WARN', 'websocket=WARN', - "keystonemiddleware=WARN", "routes.middleware=WARN", - "stevedore=WARN"] - -log_opts = [ - cfg.StrOpt('logging_context_format_string', - default='%(asctime)s.%(msecs)03d %(process)d %(levelname)s ' - '%(name)s [%(request_id)s %(user_identity)s] ' - '%(instance)s%(message)s', - help='Format string to use for log messages with context.'), - cfg.StrOpt('logging_default_format_string', - default='%(asctime)s.%(msecs)03d %(process)d %(levelname)s ' - '%(name)s [-] %(instance)s%(message)s', - help='Format string to use for log messages without context.'), - cfg.StrOpt('logging_debug_format_suffix', - default='%(funcName)s %(pathname)s:%(lineno)d', - help='Data to append to log format when level is DEBUG.'), - cfg.StrOpt('logging_exception_prefix', - default='%(asctime)s.%(msecs)03d %(process)d TRACE %(name)s ' - '%(instance)s', - help='Prefix each line of exception output with this format.'), - cfg.ListOpt('default_log_levels', - default=DEFAULT_LOG_LEVELS, - help='List of logger=LEVEL pairs.'), - cfg.BoolOpt('publish_errors', - default=False, - help='Enables or disables publication of error events.'), - cfg.BoolOpt('fatal_deprecations', - default=False, - help='Enables or disables fatal status of deprecations.'), - - # NOTE(mikal): there are two options here because sometimes we are handed - # a full instance (and could include more information), and other times we - # are just handed a UUID for the instance. - cfg.StrOpt('instance_format', - default='[instance: %(uuid)s] ', - help='The format for an instance that is passed with the log ' - 'message.'), - cfg.StrOpt('instance_uuid_format', - default='[instance: %(uuid)s] ', - help='The format for an instance UUID that is passed with the ' - 'log message.'), -] - -CONF = cfg.CONF -CONF.register_cli_opts(common_cli_opts) -CONF.register_cli_opts(logging_cli_opts) -CONF.register_opts(generic_log_opts) -CONF.register_opts(log_opts) - - -def list_opts(): - """Entry point for oslo.config-generator.""" - return [(None, copy.deepcopy(common_cli_opts)), - (None, copy.deepcopy(logging_cli_opts)), - (None, copy.deepcopy(generic_log_opts)), - (None, copy.deepcopy(log_opts)), - ] - - -# our new audit level -# NOTE(jkoelker) Since we synthesized an audit level, make the logging -# module aware of it so it acts like other levels. -logging.AUDIT = logging.INFO + 1 -logging.addLevelName(logging.AUDIT, 'AUDIT') - - -try: - NullHandler = logging.NullHandler -except AttributeError: # NOTE(jkoelker) NullHandler added in Python 2.7 - class NullHandler(logging.Handler): - def handle(self, record): - pass - - def emit(self, record): - pass - - def createLock(self): - self.lock = None - - -def _dictify_context(context): - if context is None: - return None - if not isinstance(context, dict) and getattr(context, 'to_dict', None): - context = context.to_dict() - return context - - -def _get_binary_name(): - return os.path.basename(inspect.stack()[-1][1]) - - -def _get_log_file_path(binary=None): - logfile = CONF.log_file - logdir = CONF.log_dir - - if logfile and not logdir: - return logfile - - if logfile and logdir: - return os.path.join(logdir, logfile) - - if logdir: - binary = binary or _get_binary_name() - return '%s.log' % (os.path.join(logdir, binary),) - - return None - - -class BaseLoggerAdapter(logging.LoggerAdapter): - - def audit(self, msg, *args, **kwargs): - self.log(logging.AUDIT, msg, *args, **kwargs) - - def isEnabledFor(self, level): - if _PY26: - # This method was added in python 2.7 (and it does the exact - # same logic, so we need to do the exact same logic so that - # python 2.6 has this capability as well). - return self.logger.isEnabledFor(level) - else: - return super(BaseLoggerAdapter, self).isEnabledFor(level) - - -class LazyAdapter(BaseLoggerAdapter): - def __init__(self, name='unknown', version='unknown'): - self._logger = None - self.extra = {} - self.name = name - self.version = version - - @property - def logger(self): - if not self._logger: - self._logger = getLogger(self.name, self.version) - if six.PY3: - # In Python 3, the code fails because the 'manager' attribute - # cannot be found when using a LoggerAdapter as the - # underlying logger. Work around this issue. - self._logger.manager = self._logger.logger.manager - return self._logger - - -class ContextAdapter(BaseLoggerAdapter): - warn = logging.LoggerAdapter.warning - - def __init__(self, logger, project_name, version_string): - self.logger = logger - self.project = project_name - self.version = version_string - self._deprecated_messages_sent = dict() - - @property - def handlers(self): - return self.logger.handlers - - def deprecated(self, msg, *args, **kwargs): - """Call this method when a deprecated feature is used. - - If the system is configured for fatal deprecations then the message - is logged at the 'critical' level and :class:`DeprecatedConfig` will - be raised. - - Otherwise, the message will be logged (once) at the 'warn' level. - - :raises: :class:`DeprecatedConfig` if the system is configured for - fatal deprecations. - - """ - stdmsg = _("Deprecated: %s") % msg - if CONF.fatal_deprecations: - self.critical(stdmsg, *args, **kwargs) - raise DeprecatedConfig(msg=stdmsg) - - # Using a list because a tuple with dict can't be stored in a set. - sent_args = self._deprecated_messages_sent.setdefault(msg, list()) - - if args in sent_args: - # Already logged this message, so don't log it again. - return - - sent_args.append(args) - self.warn(stdmsg, *args, **kwargs) - - def process(self, msg, kwargs): - # NOTE(jecarey): If msg is not unicode, coerce it into unicode - # before it can get to the python logging and - # possibly cause string encoding trouble - if not isinstance(msg, six.text_type): - msg = six.text_type(msg) - - if 'extra' not in kwargs: - kwargs['extra'] = {} - extra = kwargs['extra'] - - context = kwargs.pop('context', None) - if not context: - context = getattr(local.store, 'context', None) - if context: - extra.update(_dictify_context(context)) - - instance = kwargs.pop('instance', None) - instance_uuid = (extra.get('instance_uuid') or - kwargs.pop('instance_uuid', None)) - instance_extra = '' - if instance: - instance_extra = CONF.instance_format % instance - elif instance_uuid: - instance_extra = (CONF.instance_uuid_format - % {'uuid': instance_uuid}) - extra['instance'] = instance_extra - - extra.setdefault('user_identity', kwargs.pop('user_identity', None)) - - extra['project'] = self.project - extra['version'] = self.version - extra['extra'] = extra.copy() - return msg, kwargs - - -class JSONFormatter(logging.Formatter): - def __init__(self, fmt=None, datefmt=None): - # NOTE(jkoelker) we ignore the fmt argument, but its still there - # since logging.config.fileConfig passes it. - self.datefmt = datefmt - - def formatException(self, ei, strip_newlines=True): - lines = traceback.format_exception(*ei) - if strip_newlines: - lines = [moves.filter( - lambda x: x, - line.rstrip().splitlines()) for line in lines] - lines = list(itertools.chain(*lines)) - return lines - - def format(self, record): - message = {'message': record.getMessage(), - 'asctime': self.formatTime(record, self.datefmt), - 'name': record.name, - 'msg': record.msg, - 'args': record.args, - 'levelname': record.levelname, - 'levelno': record.levelno, - 'pathname': record.pathname, - 'filename': record.filename, - 'module': record.module, - 'lineno': record.lineno, - 'funcname': record.funcName, - 'created': record.created, - 'msecs': record.msecs, - 'relative_created': record.relativeCreated, - 'thread': record.thread, - 'thread_name': record.threadName, - 'process_name': record.processName, - 'process': record.process, - 'traceback': None} - - if hasattr(record, 'extra'): - message['extra'] = record.extra - - if record.exc_info: - message['traceback'] = self.formatException(record.exc_info) - - return jsonutils.dumps(message) - - -def _create_logging_excepthook(product_name): - def logging_excepthook(exc_type, value, tb): - extra = {'exc_info': (exc_type, value, tb)} - getLogger(product_name).critical( - "".join(traceback.format_exception_only(exc_type, value)), - **extra) - return logging_excepthook - - -class LogConfigError(Exception): - - message = _('Error loading logging config %(log_config)s: %(err_msg)s') - - def __init__(self, log_config, err_msg): - self.log_config = log_config - self.err_msg = err_msg - - def __str__(self): - return self.message % dict(log_config=self.log_config, - err_msg=self.err_msg) - - -def _load_log_config(log_config_append): - try: - logging.config.fileConfig(log_config_append, - disable_existing_loggers=False) - except (moves.configparser.Error, KeyError) as exc: - raise LogConfigError(log_config_append, six.text_type(exc)) - - -def setup(product_name, version='unknown'): - """Setup logging.""" - if CONF.log_config_append: - _load_log_config(CONF.log_config_append) - else: - _setup_logging_from_conf(product_name, version) - sys.excepthook = _create_logging_excepthook(product_name) - - -def set_defaults(logging_context_format_string=None, - default_log_levels=None): - # Just in case the caller is not setting the - # default_log_level. This is insurance because - # we introduced the default_log_level parameter - # later in a backwards in-compatible change - if default_log_levels is not None: - cfg.set_defaults( - log_opts, - default_log_levels=default_log_levels) - if logging_context_format_string is not None: - cfg.set_defaults( - log_opts, - logging_context_format_string=logging_context_format_string) - - -def _find_facility_from_conf(): - facility_names = logging.handlers.SysLogHandler.facility_names - facility = getattr(logging.handlers.SysLogHandler, - CONF.syslog_log_facility, - None) - - if facility is None and CONF.syslog_log_facility in facility_names: - facility = facility_names.get(CONF.syslog_log_facility) - - if facility is None: - valid_facilities = facility_names.keys() - consts = ['LOG_AUTH', 'LOG_AUTHPRIV', 'LOG_CRON', 'LOG_DAEMON', - 'LOG_FTP', 'LOG_KERN', 'LOG_LPR', 'LOG_MAIL', 'LOG_NEWS', - 'LOG_AUTH', 'LOG_SYSLOG', 'LOG_USER', 'LOG_UUCP', - 'LOG_LOCAL0', 'LOG_LOCAL1', 'LOG_LOCAL2', 'LOG_LOCAL3', - 'LOG_LOCAL4', 'LOG_LOCAL5', 'LOG_LOCAL6', 'LOG_LOCAL7'] - valid_facilities.extend(consts) - raise TypeError(_('syslog facility must be one of: %s') % - ', '.join("'%s'" % fac - for fac in valid_facilities)) - - return facility - - -class RFCSysLogHandler(logging.handlers.SysLogHandler): - def __init__(self, *args, **kwargs): - self.binary_name = _get_binary_name() - # Do not use super() unless type(logging.handlers.SysLogHandler) - # is 'type' (Python 2.7). - # Use old style calls, if the type is 'classobj' (Python 2.6) - logging.handlers.SysLogHandler.__init__(self, *args, **kwargs) - - def format(self, record): - # Do not use super() unless type(logging.handlers.SysLogHandler) - # is 'type' (Python 2.7). - # Use old style calls, if the type is 'classobj' (Python 2.6) - msg = logging.handlers.SysLogHandler.format(self, record) - msg = self.binary_name + ' ' + msg - return msg - - -def _setup_logging_from_conf(project, version): - log_root = getLogger(None).logger - for handler in log_root.handlers: - log_root.removeHandler(handler) - - logpath = _get_log_file_path() - if logpath: - filelog = logging.handlers.WatchedFileHandler(logpath) - log_root.addHandler(filelog) - - if CONF.use_stderr: - streamlog = ColorHandler() - log_root.addHandler(streamlog) - - elif not logpath: - # pass sys.stdout as a positional argument - # python2.6 calls the argument strm, in 2.7 it's stream - streamlog = logging.StreamHandler(sys.stdout) - log_root.addHandler(streamlog) - - if CONF.publish_errors: - handler = importutils.import_object( - "oslo.messaging.notify.log_handler.PublishErrorsHandler", - logging.ERROR) - log_root.addHandler(handler) - - datefmt = CONF.log_date_format - for handler in log_root.handlers: - # NOTE(alaski): CONF.log_format overrides everything currently. This - # should be deprecated in favor of context aware formatting. - if CONF.log_format: - handler.setFormatter(logging.Formatter(fmt=CONF.log_format, - datefmt=datefmt)) - log_root.info('Deprecated: log_format is now deprecated and will ' - 'be removed in the next release') - else: - handler.setFormatter(ContextFormatter(project=project, - version=version, - datefmt=datefmt)) - - if CONF.debug: - log_root.setLevel(logging.DEBUG) - elif CONF.verbose: - log_root.setLevel(logging.INFO) - else: - log_root.setLevel(logging.WARNING) - - for pair in CONF.default_log_levels: - mod, _sep, level_name = pair.partition('=') - logger = logging.getLogger(mod) - # NOTE(AAzza) in python2.6 Logger.setLevel doesn't convert string name - # to integer code. - if sys.version_info < (2, 7): - level = logging.getLevelName(level_name) - logger.setLevel(level) - else: - logger.setLevel(level_name) - - if CONF.use_syslog: - try: - facility = _find_facility_from_conf() - # TODO(bogdando) use the format provided by RFCSysLogHandler - # after existing syslog format deprecation in J - if CONF.use_syslog_rfc_format: - syslog = RFCSysLogHandler(address='/dev/log', - facility=facility) - else: - syslog = logging.handlers.SysLogHandler(address='/dev/log', - facility=facility) - log_root.addHandler(syslog) - except socket.error: - log_root.error('Unable to add syslog handler. Verify that syslog ' - 'is running.') - - -_loggers = {} - - -def getLogger(name='unknown', version='unknown'): - if name not in _loggers: - _loggers[name] = ContextAdapter(logging.getLogger(name), - name, - version) - return _loggers[name] - - -def getLazyLogger(name='unknown', version='unknown'): - """Returns lazy logger. - - Creates a pass-through logger that does not create the real logger - until it is really needed and delegates all calls to the real logger - once it is created. - """ - return LazyAdapter(name, version) - - -class WritableLogger(object): - """A thin wrapper that responds to `write` and logs.""" - - def __init__(self, logger, level=logging.INFO): - self.logger = logger - self.level = level - - def write(self, msg): - self.logger.log(self.level, msg.rstrip()) - - -class ContextFormatter(logging.Formatter): - """A context.RequestContext aware formatter configured through flags. - - The flags used to set format strings are: logging_context_format_string - and logging_default_format_string. You can also specify - logging_debug_format_suffix to append extra formatting if the log level is - debug. - - For information about what variables are available for the formatter see: - http://docs.python.org/library/logging.html#formatter - - If available, uses the context value stored in TLS - local.store.context - - """ - - def __init__(self, *args, **kwargs): - """Initialize ContextFormatter instance - - Takes additional keyword arguments which can be used in the message - format string. - - :keyword project: project name - :type project: string - :keyword version: project version - :type version: string - - """ - - self.project = kwargs.pop('project', 'unknown') - self.version = kwargs.pop('version', 'unknown') - - logging.Formatter.__init__(self, *args, **kwargs) - - def format(self, record): - """Uses contextstring if request_id is set, otherwise default.""" - - # NOTE(jecarey): If msg is not unicode, coerce it into unicode - # before it can get to the python logging and - # possibly cause string encoding trouble - if not isinstance(record.msg, six.text_type): - record.msg = six.text_type(record.msg) - - # store project info - record.project = self.project - record.version = self.version - - # store request info - context = getattr(local.store, 'context', None) - if context: - d = _dictify_context(context) - for k, v in d.items(): - setattr(record, k, v) - - # NOTE(sdague): default the fancier formatting params - # to an empty string so we don't throw an exception if - # they get used - for key in ('instance', 'color', 'user_identity'): - if key not in record.__dict__: - record.__dict__[key] = '' - - if record.__dict__.get('request_id'): - fmt = CONF.logging_context_format_string - else: - fmt = CONF.logging_default_format_string - - if (record.levelno == logging.DEBUG and - CONF.logging_debug_format_suffix): - fmt += " " + CONF.logging_debug_format_suffix - - if sys.version_info < (3, 2): - self._fmt = fmt - else: - self._style = logging.PercentStyle(fmt) - self._fmt = self._style._fmt - # Cache this on the record, Logger will respect our formatted copy - if record.exc_info: - record.exc_text = self.formatException(record.exc_info, record) - return logging.Formatter.format(self, record) - - def formatException(self, exc_info, record=None): - """Format exception output with CONF.logging_exception_prefix.""" - if not record: - return logging.Formatter.formatException(self, exc_info) - - stringbuffer = moves.StringIO() - traceback.print_exception(exc_info[0], exc_info[1], exc_info[2], - None, stringbuffer) - lines = stringbuffer.getvalue().split('\n') - stringbuffer.close() - - if CONF.logging_exception_prefix.find('%(asctime)') != -1: - record.asctime = self.formatTime(record, self.datefmt) - - formatted_lines = [] - for line in lines: - pl = CONF.logging_exception_prefix % record.__dict__ - fl = '%s%s' % (pl, line) - formatted_lines.append(fl) - return '\n'.join(formatted_lines) - - -class ColorHandler(logging.StreamHandler): - LEVEL_COLORS = { - logging.DEBUG: '\033[00;32m', # GREEN - logging.INFO: '\033[00;36m', # CYAN - logging.AUDIT: '\033[01;36m', # BOLD CYAN - logging.WARN: '\033[01;33m', # BOLD YELLOW - logging.ERROR: '\033[01;31m', # BOLD RED - logging.CRITICAL: '\033[01;31m', # BOLD RED - } - - def format(self, record): - record.color = self.LEVEL_COLORS[record.levelno] - return logging.StreamHandler.format(self, record) - - -class DeprecatedConfig(Exception): - message = _("Fatal call to deprecated config: %(msg)s") - - def __init__(self, msg): - super(Exception, self).__init__(self.message % dict(msg=msg)) diff --git a/ironic/tests/base.py b/ironic/tests/base.py index 9059ccfcb..f7d11e0eb 100644 --- a/ironic/tests/base.py +++ b/ironic/tests/base.py @@ -30,19 +30,20 @@ eventlet.monkey_patch(os=False) import fixtures from oslo_config import cfg from oslo_context import context as ironic_context +from oslo_log import log as logging import testtools from ironic.common import hash_ring from ironic.objects import base as objects_base -from ironic.openstack.common import log as logging from ironic.tests import conf_fixture from ironic.tests import policy_fixture CONF = cfg.CONF +logging.register_options(CONF) CONF.set_override('use_stderr', False) -logging.setup('ironic') +logging.setup(CONF, 'ironic') class ReplaceModule(fixtures.Fixture): diff --git a/ironic/tests/db/sqlalchemy/test_migrations.py b/ironic/tests/db/sqlalchemy/test_migrations.py index 37b539e02..dabbcae02 100644 --- a/ironic/tests/db/sqlalchemy/test_migrations.py +++ b/ironic/tests/db/sqlalchemy/test_migrations.py @@ -42,6 +42,7 @@ from oslo_db import exception as db_exc from oslo_db.sqlalchemy import test_base from oslo_db.sqlalchemy import test_migrations from oslo_db.sqlalchemy import utils as db_utils +from oslo_log import log as logging from oslo_utils import uuidutils import sqlalchemy import sqlalchemy.exc @@ -49,7 +50,6 @@ import sqlalchemy.exc from ironic.common.i18n import _LE from ironic.db.sqlalchemy import migration from ironic.db.sqlalchemy import models -from ironic.openstack.common import log as logging from ironic.tests import base LOG = logging.getLogger(__name__) |