Standardize logging delaration and use

* Make modules use getLogger(__name__) and log to the result

Change-Id: Ib6d69b4be140ec89affc86ed11e65e422d551df1
This commit is contained in:
Jason Kölker
2012-02-14 12:07:02 -06:00
parent 283622b0ff
commit b800ceb90e
52 changed files with 53 additions and 53 deletions

View File

@@ -90,7 +90,7 @@ ldap_opts = [
FLAGS = flags.FLAGS
FLAGS.register_opts(ldap_opts)
LOG = logging.getLogger("nova.ldapdriver")
LOG = logging.getLogger(__name__)
if FLAGS.memcached_servers:

View File

@@ -96,7 +96,7 @@ FLAGS.register_opts(auth_opts)
flags.DECLARE('osapi_compute_listen_port', 'nova.service')
LOG = logging.getLogger('nova.auth.manager')
LOG = logging.getLogger(__name__)
if FLAGS.memcached_servers:

View File

@@ -57,7 +57,7 @@ from nova import exception
from nova import log as logging
LOG = logging.getLogger('nova.signer')
LOG = logging.getLogger(__name__)
class Signer(object):

View File

@@ -32,7 +32,7 @@ import webob.exc
from nova import log as logging
LOG = logging.getLogger('nova.exception')
LOG = logging.getLogger(__name__)
class ConvertedException(webob.exc.WSGIHTTPException):

View File

@@ -63,7 +63,7 @@ from nova import version
FLAGS = flags.FLAGS
LOG = logging.getLogger('nova.manager')
LOG = logging.getLogger(__name__)
def periodic_task(*args, **kwargs):

View File

@@ -21,7 +21,7 @@ from nova import log as logging
from nova.openstack.common import cfg
LOG = logging.getLogger('nova.exception')
LOG = logging.getLogger(__name__)
notifier_opts = [
cfg.StrOpt('default_notification_level',

View File

@@ -18,7 +18,7 @@ from nova import db
from nova import log as logging
LOG = logging.getLogger('nova.notifier.capacity_notifier')
LOG = logging.getLogger(__name__)
def notify(message):

View File

@@ -27,7 +27,7 @@ list_notifier_drivers_opt = cfg.MultiStrOpt('list_notifier_drivers',
FLAGS = flags.FLAGS
FLAGS.register_opt(list_notifier_drivers_opt)
LOG = logging.getLogger('nova.notifier.list_notifier')
LOG = logging.getLogger(__name__)
drivers = None

View File

@@ -25,7 +25,7 @@ from nova import log as logging
from nova.openstack.common import cfg
LOG = logging.getLogger('nova.rpc')
LOG = logging.getLogger(__name__)
rpc_opts = [
cfg.IntOpt('rpc_thread_pool_size',

View File

@@ -40,7 +40,7 @@ enable_zone_routing_opt = cfg.BoolOpt('enable_zone_routing',
FLAGS = flags.FLAGS
FLAGS.register_opt(enable_zone_routing_opt)
LOG = logging.getLogger('nova.scheduler.api')
LOG = logging.getLogger(__name__)
def _call_scheduler(method, context, params=None):

View File

@@ -38,7 +38,7 @@ from nova import utils
FLAGS = flags.FLAGS
LOG = logging.getLogger('nova.scheduler.distributed_scheduler')
LOG = logging.getLogger(__name__)
class DistributedScheduler(driver.Scheduler):

View File

@@ -36,7 +36,7 @@ from nova.scheduler import zone_manager
from nova import utils
LOG = logging.getLogger('nova.scheduler.driver')
LOG = logging.getLogger(__name__)
scheduler_driver_opts = [
cfg.StrOpt('scheduler_host_manager',

View File

@@ -18,7 +18,7 @@ from nova.scheduler.filters import abstract_filter
from nova import utils
LOG = logging.getLogger('nova.scheduler.filter.compute_filter')
LOG = logging.getLogger(__name__)
class ComputeFilter(abstract_filter.AbstractHostFilter):

View File

@@ -21,7 +21,7 @@ from nova.openstack.common import cfg
from nova.scheduler.filters import abstract_filter
LOG = logging.getLogger('nova.scheduler.filter.core_filter')
LOG = logging.getLogger(__name__)
cpu_allocation_ratio_opt = cfg.FloatOpt('cpu_allocation_ratio',
default=16.0,

View File

@@ -19,7 +19,7 @@ from nova import log as logging
from nova.openstack.common import cfg
from nova.scheduler.filters import abstract_filter
LOG = logging.getLogger('nova.scheduler.filter.ram_filter')
LOG = logging.getLogger(__name__)
ram_allocation_ratio_opt = cfg.FloatOpt("ram_allocation_ratio",
default=1.0,

View File

@@ -49,7 +49,7 @@ host_manager_opts = [
FLAGS = flags.FLAGS
FLAGS.register_opts(host_manager_opts)
LOG = logging.getLogger('nova.scheduler.host_manager')
LOG = logging.getLogger(__name__)
class ReadOnlyDict(UserDict.IterableUserDict):

View File

@@ -27,7 +27,7 @@ from nova.openstack.common import cfg
from nova import log as logging
LOG = logging.getLogger('nova.scheduler.least_cost')
LOG = logging.getLogger(__name__)
least_cost_opts = [
cfg.ListOpt('least_cost_functions',

View File

@@ -34,7 +34,7 @@ from nova import rpc
from nova import utils
LOG = logging.getLogger('nova.scheduler.manager')
LOG = logging.getLogger(__name__)
scheduler_driver_opt = cfg.StrOpt('scheduler_driver',
default='nova.scheduler.multi.MultiScheduler',

View File

@@ -37,7 +37,7 @@ scheduler_json_config_location_opt = cfg.StrOpt(
FLAGS = flags.FLAGS
FLAGS.register_opt(scheduler_json_config_location_opt)
LOG = logging.getLogger('nova.scheduler.scheduler_options')
LOG = logging.getLogger(__name__)
class SchedulerOptions(object):

View File

@@ -33,7 +33,7 @@ from nova.vsa.api import VsaState
from nova.volume import volume_types
LOG = logging.getLogger('nova.scheduler.vsa')
LOG = logging.getLogger(__name__)
vsa_scheduler_opts = [
cfg.IntOpt('drive_type_approx_capacity_percent',

View File

@@ -42,7 +42,7 @@ zone_manager_opts = [
FLAGS = flags.FLAGS
FLAGS.register_opts(zone_manager_opts)
LOG = logging.getLogger('nova.scheduler.zone_manager')
LOG = logging.getLogger(__name__)
class ZoneState(object):

View File

@@ -37,7 +37,7 @@ from nova import version
from nova import wsgi
LOG = logging.getLogger('nova.service')
LOG = logging.getLogger(__name__)
service_opts = [
cfg.IntOpt('report_interval',

View File

@@ -35,7 +35,7 @@ import stubout
from nova import flags
import nova.image.fake
from nova import log
from nova import log as logging
from nova.openstack.common import cfg
from nova import utils
from nova import service
@@ -55,7 +55,7 @@ test_opts = [
FLAGS = flags.FLAGS
FLAGS.register_opts(test_opts)
LOG = log.getLogger('nova.tests')
LOG = logging.getLogger(__name__)
class skip_test(object):

View File

@@ -26,7 +26,7 @@ from eventlet import greenthread
from nova import log as logging
LOG = logging.getLogger("nova.testing.fake.rabbit")
LOG = logging.getLogger(__name__)
EXCHANGES = {}

View File

@@ -29,7 +29,7 @@ from nova.rpc.common import RemoteError, Timeout
from nova import test
LOG = logging.getLogger('nova.tests.rpc')
LOG = logging.getLogger(__name__)
class _BaseRpcTestCase(test.TestCase):

View File

@@ -24,7 +24,7 @@ from nova.rpc import impl_carrot
from nova.tests.rpc import common
LOG = logging.getLogger('nova.tests.rpc')
LOG = logging.getLogger(__name__)
class RpcCarrotTestCase(common._BaseRpcTestCase):

View File

@@ -24,7 +24,7 @@ from nova.rpc import impl_fake
from nova.tests.rpc import common
LOG = logging.getLogger('nova.tests.rpc')
LOG = logging.getLogger(__name__)
class RpcFakeTestCase(common._BaseRpcTestCase):

View File

@@ -25,7 +25,7 @@ from nova.rpc import impl_kombu
from nova.tests.rpc import common
LOG = logging.getLogger('nova.tests.rpc')
LOG = logging.getLogger(__name__)
class MyException(Exception):

View File

@@ -35,7 +35,7 @@ except ImportError:
impl_qpid = None
LOG = logging.getLogger('nova.tests.rpc')
LOG = logging.getLogger(__name__)
class RpcQpidTestCase(test.TestCase):

View File

@@ -27,7 +27,7 @@ from nova.volume import volume_types
FLAGS = flags.FLAGS
LOG = logging.getLogger('nova.tests.scheduler.vsa')
LOG = logging.getLogger(__name__)
scheduled_volumes = []
scheduled_volume = {}

View File

@@ -20,7 +20,7 @@ from nova import log as logging
from nova.volume.san import SolidFireSanISCSIDriver as SFID
from nova import test
LOG = logging.getLogger('nova.tests.test_solidfire')
LOG = logging.getLogger(__name__)
class SolidFireVolumeTestCase(test.TestCase):

View File

@@ -28,7 +28,7 @@ from nova.api.ec2 import cloud
from nova.auth import fakeldap
FLAGS = flags.FLAGS
LOG = logging.getLogger('nova.tests.auth_unittest')
LOG = logging.getLogger(__name__)
class user_generator(object):

View File

@@ -54,7 +54,7 @@ from nova import utils
import nova.volume
LOG = logging.getLogger('nova.tests.compute')
LOG = logging.getLogger(__name__)
FLAGS = flags.FLAGS
flags.DECLARE('stub_network', 'nova.compute.manager')
flags.DECLARE('live_migration_retry_count', 'nova.compute.manager')

View File

@@ -32,7 +32,7 @@ from nova.notifier import test_notifier
from nova.tests import fake_network
LOG = logging.getLogger('nova.tests.compute_utils')
LOG = logging.getLogger(__name__)
FLAGS = flags.FLAGS
flags.DECLARE('stub_network', 'nova.compute.manager')

View File

@@ -32,7 +32,7 @@ from nova.consoleauth import manager
FLAGS = flags.FLAGS
LOG = logging.getLogger('nova.tests.consoleauth')
LOG = logging.getLogger(__name__)
class ConsoleauthTestCase(test.TestCase):

View File

@@ -35,7 +35,7 @@ from nova.virt.libvirt import utils as virtutils
flags.DECLARE('instances_path', 'nova.compute.manager')
FLAGS = flags.FLAGS
LOG = logging.getLogger('nova.tests.test_imagecache')
LOG = logging.getLogger(__name__)
class ImageCacheManagerTestCase(test.TestCase):

View File

@@ -28,7 +28,7 @@ from nova.db.sqlalchemy.session import get_session
from nova.db.sqlalchemy import models
FLAGS = flags.FLAGS
LOG = logging.getLogger('nova.tests.compute')
LOG = logging.getLogger(__name__)
class InstanceTypeTestCase(test.TestCase):

View File

@@ -54,7 +54,7 @@ except ImportError:
FLAGS = flags.FLAGS
LOG = logging.getLogger('nova.tests.test_libvirt')
LOG = logging.getLogger(__name__)
_fake_network_info = fake_network.fake_get_instance_nw_info
_ipv4_like = fake_network.ipv4_like

View File

@@ -30,7 +30,7 @@ from nova.network import linux_net
FLAGS = flags.FLAGS
LOG = logging.getLogger('nova.tests.network')
LOG = logging.getLogger(__name__)
HOST = "testhost"

View File

@@ -30,7 +30,7 @@ from nova.network import manager as network_manager
from nova.tests import fake_network
LOG = logging.getLogger('nova.tests.network')
LOG = logging.getLogger(__name__)
HOST = "testhost"

View File

@@ -21,7 +21,7 @@ from nova.network import model
from nova import test
from nova.tests import fake_network_cache_model
LOG = logging.getLogger('nova.tests.network')
LOG = logging.getLogger(__name__)
class RouteTests(test.TestCase):

View File

@@ -27,7 +27,7 @@ from nova import test
from nova import utils
from nova.network import manager
LOG = logging.getLogger('nova.tests.quantum_network')
LOG = logging.getLogger(__name__)
# this class can be used for unit functional/testing on nova,

View File

@@ -29,7 +29,7 @@ from nova.tests import utils as test_utils
libvirt = None
FLAGS = flags.FLAGS
LOG = logging.getLogger('nova.tests.test_virt_drivers')
LOG = logging.getLogger(__name__)
def catch_notimplementederror(f):

View File

@@ -34,7 +34,7 @@ from nova import utils
import nova.volume.api
FLAGS = flags.FLAGS
LOG = logging.getLogger('nova.tests.volume')
LOG = logging.getLogger(__name__)
class VolumeTestCase(test.TestCase):

View File

@@ -28,7 +28,7 @@ from nova.db.sqlalchemy.session import get_session
from nova.db.sqlalchemy import models
FLAGS = flags.FLAGS
LOG = logging.getLogger('nova.tests.test_volume_types')
LOG = logging.getLogger(__name__)
class VolumeTypeTestCase(test.TestCase):

View File

@@ -30,7 +30,7 @@ from nova.vsa import utils as vsa_utils
import nova.image.fake
FLAGS = flags.FLAGS
LOG = logging.getLogger('nova.tests.vsa')
LOG = logging.getLogger(__name__)
class VsaTestCase(test.TestCase):

View File

@@ -23,7 +23,7 @@ from nova import log as logging
import nova.image.fake
FLAGS = flags.FLAGS
LOG = logging.getLogger('nova.tests.vsa.volumes')
LOG = logging.getLogger(__name__)
class VsaVolumesTestCase(test.TestCase):

View File

@@ -45,7 +45,7 @@ from nova.tests.glance import stubs as glance_stubs
from nova.tests import fake_network
from nova.tests import fake_utils
LOG = logging.getLogger('nova.tests.test_xenapi')
LOG = logging.getLogger(__name__)
FLAGS = flags.FLAGS

View File

@@ -52,7 +52,7 @@ from nova import log as logging
from nova.openstack.common import cfg
LOG = logging.getLogger("nova.utils")
LOG = logging.getLogger(__name__)
ISO_TIME_FORMAT = "%Y-%m-%dT%H:%M:%SZ"
PERFECT_TIME_FORMAT = "%Y-%m-%dT%H:%M:%S.%f"
FLAGS = flags.FLAGS

View File

@@ -64,7 +64,7 @@ vsa_opts = [
FLAGS = flags.FLAGS
FLAGS.register_opts(vsa_opts)
LOG = logging.getLogger('nova.vsa')
LOG = logging.getLogger(__name__)
class API(base.Base):

View File

@@ -42,7 +42,7 @@ vsa_driver_opt = cfg.StrOpt('vsa_driver',
FLAGS = flags.FLAGS
FLAGS.register_opt(vsa_driver_opt)
LOG = logging.getLogger('nova.vsa.manager')
LOG = logging.getLogger(__name__)
class VsaManager(manager.SchedulerDependentManager):

View File

@@ -36,7 +36,7 @@ from nova import utils
FLAGS = flags.FLAGS
LOG = logging.getLogger('nova.wsgi')
LOG = logging.getLogger(__name__)
class Server(object):