From d335457f48d09c3d780c92413fe777030c1335e2 Mon Sep 17 00:00:00 2001 From: Andrew Bogott Date: Thu, 28 Jun 2012 15:59:23 -0500 Subject: [PATCH] Switch to common logging. I only just moved logging from nova to common, so behavior should remain the same. Change-Id: I1d7304ca200f9d024bb7244d25be2f9a670318fb --- bin/nova-all | 4 +- bin/nova-api | 4 +- bin/nova-api-ec2 | 4 +- bin/nova-api-metadata | 4 +- bin/nova-api-os-compute | 4 +- bin/nova-api-os-volume | 4 +- bin/nova-cert | 4 +- bin/nova-clear-rabbit-queues | 4 +- bin/nova-compute | 4 +- bin/nova-console | 4 +- bin/nova-consoleauth | 4 +- bin/nova-dhcpbridge | 4 +- bin/nova-instance-usage-audit | 4 +- bin/nova-manage | 4 +- bin/nova-network | 4 +- bin/nova-objectstore | 4 +- bin/nova-rpc-zmq-receiver | 2 +- bin/nova-scheduler | 4 +- bin/nova-volume | 4 +- bin/nova-volume-usage-audit | 4 +- bin/nova-xvpvncproxy | 4 +- etc/nova/logging_sample.conf | 2 +- nova/api/auth.py | 2 +- nova/api/ec2/__init__.py | 2 +- nova/api/ec2/apirequest.py | 2 +- nova/api/ec2/cloud.py | 2 +- nova/api/ec2/ec2utils.py | 2 +- nova/api/metadata/base.py | 2 +- nova/api/metadata/handler.py | 2 +- nova/api/openstack/__init__.py | 2 +- nova/api/openstack/auth.py | 2 +- nova/api/openstack/common.py | 2 +- nova/api/openstack/compute/__init__.py | 2 +- .../api/openstack/compute/contrib/__init__.py | 2 +- .../api/openstack/compute/contrib/accounts.py | 2 +- .../compute/contrib/admin_actions.py | 2 +- .../openstack/compute/contrib/aggregates.py | 2 +- .../openstack/compute/contrib/certificates.py | 2 +- .../openstack/compute/contrib/cloudpipe.py | 2 +- .../compute/contrib/console_output.py | 2 +- .../api/openstack/compute/contrib/consoles.py | 2 +- .../compute/contrib/deferred_delete.py | 2 +- .../contrib/extended_server_attributes.py | 2 +- .../compute/contrib/extended_status.py | 2 +- .../openstack/compute/contrib/flavormanage.py | 2 +- .../compute/contrib/floating_ip_dns.py | 2 +- .../compute/contrib/floating_ip_pools.py | 2 +- .../openstack/compute/contrib/floating_ips.py | 2 +- nova/api/openstack/compute/contrib/hosts.py | 2 +- .../openstack/compute/contrib/hypervisors.py | 2 +- .../api/openstack/compute/contrib/multinic.py | 2 +- .../api/openstack/compute/contrib/networks.py | 2 +- nova/api/openstack/compute/contrib/rescue.py | 2 +- .../compute/contrib/scheduler_hints.py | 2 +- .../compute/contrib/security_groups.py | 2 +- .../compute/contrib/server_start_stop.py | 2 +- nova/api/openstack/compute/contrib/users.py | 2 +- .../compute/contrib/virtual_interfaces.py | 2 +- nova/api/openstack/compute/contrib/volumes.py | 2 +- nova/api/openstack/compute/extensions.py | 2 +- nova/api/openstack/compute/images.py | 2 +- nova/api/openstack/compute/ips.py | 2 +- nova/api/openstack/compute/servers.py | 2 +- nova/api/openstack/compute/views/addresses.py | 2 +- nova/api/openstack/compute/views/servers.py | 2 +- nova/api/openstack/extensions.py | 2 +- nova/api/openstack/urlmap.py | 2 +- nova/api/openstack/volume/__init__.py | 2 +- nova/api/openstack/volume/contrib/__init__.py | 2 +- nova/api/openstack/volume/extensions.py | 2 +- nova/api/openstack/volume/snapshots.py | 2 +- nova/api/openstack/volume/volumes.py | 2 +- nova/api/openstack/wsgi.py | 2 +- nova/api/sizelimit.py | 2 +- nova/auth/ldapdriver.py | 2 +- nova/auth/manager.py | 2 +- nova/auth/signer.py | 2 +- nova/cert/manager.py | 2 +- nova/cloudpipe/pipelib.py | 2 +- nova/common/deprecated.py | 2 +- nova/compute/api.py | 2 +- nova/compute/instance_types.py | 2 +- nova/compute/manager.py | 2 +- nova/compute/utils.py | 2 +- nova/console/manager.py | 2 +- nova/console/vmrc_manager.py | 2 +- nova/console/xvp.py | 2 +- nova/consoleauth/manager.py | 2 +- nova/context.py | 2 +- nova/crypto.py | 2 +- nova/db/sqlalchemy/api.py | 2 +- .../migrate_repo/versions/082_essex.py | 2 +- .../migrate_repo/versions/083_quota_class.py | 2 +- .../087_add_uuid_to_bw_usage_cache.py | 2 +- ...ance_id_to_uuid_in_block_device_mapping.py | 2 +- .../versions/089_add_volume_id_mappings.py | 2 +- .../versions/090_modify_volume_id_datatype.py | 3 +- .../091_convert_volume_ids_to_uuid.py | 2 +- .../092_add_instance_system_metadata.py | 2 +- .../095_change_fk_instance_id_to_uuid.py | 2 +- .../versions/097_quota_usages_reservations.py | 2 +- .../099_add_disabled_instance_types.py | 2 +- .../100_instance_metadata_uses_uuid.py | 2 +- ...ty_group_instance_association_uses_uuid.py | 2 +- .../versions/102_consoles_uses_uuid.py | 2 +- .../105_instance_info_caches_uses_uuid.py | 2 +- .../versions/106_add_foreign_keys.py | 2 +- .../versions/107_add_instance_id_mappings.py | 2 +- nova/db/sqlalchemy/migration.py | 2 +- nova/db/sqlalchemy/session.py | 2 +- nova/exception.py | 2 +- nova/flags.py | 16 - nova/image/glance.py | 2 +- nova/image/s3.py | 2 +- nova/manager.py | 2 +- nova/network/api.py | 2 +- nova/network/l3.py | 2 +- nova/network/ldapdns.py | 2 +- nova/network/linux_net.py | 2 +- nova/network/manager.py | 2 +- nova/network/quantum/manager.py | 2 +- nova/network/quantum/melange_connection.py | 2 +- nova/network/quantum/melange_ipam_lib.py | 2 +- nova/network/quantum/nova_ipam_lib.py | 2 +- nova/network/quantum/quantum_connection.py | 2 +- nova/network/quantum/sg.py | 2 +- nova/notifications.py | 2 +- nova/notifier/api.py | 2 +- nova/notifier/capacity_notifier.py | 2 +- nova/notifier/list_notifier.py | 2 +- nova/notifier/log_notifier.py | 2 +- nova/notifier/rabbit_notifier.py | 2 +- nova/{ => openstack/common}/log.py | 354 ++++++++++-------- nova/openstack/common/rpc/impl_zmq.py | 4 +- nova/quota.py | 2 +- nova/scheduler/driver.py | 2 +- nova/scheduler/filter_scheduler.py | 2 +- nova/scheduler/filters/arch_filter.py | 2 +- nova/scheduler/filters/compute_filter.py | 2 +- nova/scheduler/filters/core_filter.py | 2 +- nova/scheduler/filters/ram_filter.py | 2 +- nova/scheduler/filters/trusted_filter.py | 2 +- nova/scheduler/host_manager.py | 2 +- nova/scheduler/least_cost.py | 2 +- nova/scheduler/manager.py | 2 +- nova/scheduler/scheduler_options.py | 2 +- nova/service.py | 2 +- nova/test.py | 2 +- nova/tests/__init__.py | 4 +- nova/tests/api/ec2/test_cloud.py | 2 +- nova/tests/api/ec2/test_ec2_validate.py | 2 +- .../compute/contrib/test_aggregates.py | 2 +- .../openstack/compute/contrib/test_hosts.py | 2 +- .../compute/contrib/test_snapshots.py | 2 +- .../compute/contrib/test_volume_types.py | 2 +- .../api/openstack/compute/test_urlmap.py | 2 +- .../tests/api/openstack/volume/test_router.py | 2 +- .../api/openstack/volume/test_snapshots.py | 2 +- nova/tests/compute/test_compute.py | 2 +- nova/tests/consoleauth/test_consoleauth.py | 2 +- nova/tests/fake_utils.py | 2 +- nova/tests/image/fake.py | 2 +- nova/tests/integrated/api/client.py | 2 +- nova/tests/integrated/integrated_helpers.py | 3 +- nova/tests/integrated/test_extensions.py | 2 +- nova/tests/integrated/test_login.py | 2 +- .../tests/integrated/test_multiprocess_api.py | 2 +- nova/tests/integrated/test_servers.py | 2 +- nova/tests/integrated/test_volumes.py | 2 +- nova/tests/integrated/test_xml.py | 2 +- nova/tests/network/test_linux_net.py | 2 +- nova/tests/network/test_manager.py | 2 +- nova/tests/network/test_network_info.py | 2 +- nova/tests/network/test_quantum.py | 2 +- nova/tests/notifier/test_list_notifier.py | 2 +- nova/tests/test_SolidFireSanISCSIDriver.py | 2 +- nova/tests/test_auth.py | 2 +- nova/tests/test_compute_utils.py | 2 +- nova/tests/test_imagecache.py | 6 +- nova/tests/test_instance_types.py | 2 +- nova/tests/test_ipv6.py | 2 +- nova/tests/test_libvirt.py | 2 +- nova/tests/test_log.py | 217 ----------- nova/tests/test_migrations.py | 2 +- nova/tests/test_netapp.py | 2 +- nova/tests/test_notifications.py | 2 +- nova/tests/test_notifier.py | 4 +- nova/tests/test_virt_drivers.py | 2 +- nova/tests/test_volume.py | 4 +- nova/tests/test_volume_types.py | 2 +- nova/tests/test_volume_utils.py | 2 +- nova/tests/test_xenapi.py | 2 +- nova/tests/test_xensm.py | 2 +- nova/tests/volume/test_HpSanISCSIDriver.py | 2 +- nova/utils.py | 2 +- nova/virt/baremetal/dom.py | 2 +- nova/virt/baremetal/proxy.py | 2 +- nova/virt/baremetal/tilera.py | 2 +- nova/virt/connection.py | 2 +- nova/virt/disk/api.py | 2 +- nova/virt/disk/mount.py | 2 +- nova/virt/driver.py | 2 +- nova/virt/fake.py | 2 +- nova/virt/firewall.py | 2 +- nova/virt/images.py | 2 +- nova/virt/libvirt/config.py | 2 +- nova/virt/libvirt/driver.py | 2 +- nova/virt/libvirt/firewall.py | 2 +- nova/virt/libvirt/imagecache.py | 2 +- nova/virt/libvirt/utils.py | 2 +- nova/virt/libvirt/vif.py | 2 +- nova/virt/libvirt/volume.py | 2 +- nova/virt/vmwareapi/fake.py | 2 +- nova/virt/vmwareapi/io_util.py | 2 +- nova/virt/vmwareapi/network_utils.py | 2 +- nova/virt/vmwareapi/read_write_util.py | 2 +- nova/virt/vmwareapi/vif.py | 2 +- nova/virt/vmwareapi/vmops.py | 2 +- nova/virt/vmwareapi/vmware_images.py | 2 +- nova/virt/vmwareapi_conn.py | 2 +- nova/virt/xenapi/connection.py | 2 +- nova/virt/xenapi/fake.py | 2 +- nova/virt/xenapi/firewall.py | 2 +- nova/virt/xenapi/pool.py | 2 +- nova/virt/xenapi/vif.py | 2 +- nova/virt/xenapi/vm_utils.py | 2 +- nova/virt/xenapi/vmops.py | 2 +- nova/virt/xenapi/volume_utils.py | 2 +- nova/virt/xenapi/volumeops.py | 2 +- nova/vnc/xvp_proxy.py | 2 +- nova/volume/api.py | 2 +- nova/volume/driver.py | 2 +- nova/volume/manager.py | 2 +- nova/volume/netapp.py | 2 +- nova/volume/nexenta/jsonrpc.py | 2 +- nova/volume/nexenta/volume.py | 2 +- nova/volume/san.py | 2 +- nova/volume/utils.py | 2 +- nova/volume/volume_types.py | 2 +- nova/volume/xensm.py | 2 +- nova/wsgi.py | 2 +- openstack-common.conf | 2 +- tools/clean_file_locks.py | 2 +- 243 files changed, 456 insertions(+), 665 deletions(-) rename nova/{ => openstack/common}/log.py (76%) delete mode 100644 nova/tests/test_log.py diff --git a/bin/nova-all b/bin/nova-all index 6aee8780560e..a67c77b99d21 100755 --- a/bin/nova-all +++ b/bin/nova-all @@ -41,8 +41,8 @@ if os.path.exists(os.path.join(possible_topdir, "nova", "__init__.py")): from nova import flags -from nova import log as logging from nova.objectstore import s3server +from nova.openstack.common import log as logging from nova import service from nova import utils from nova.vnc import xvp_proxy @@ -52,7 +52,7 @@ LOG = logging.getLogger('nova.all') if __name__ == '__main__': flags.parse_args(sys.argv) - logging.setup() + logging.setup("nova") utils.monkey_patch() launcher = service.ProcessLauncher() diff --git a/bin/nova-api b/bin/nova-api index b778854f0897..f55eca719dd6 100755 --- a/bin/nova-api +++ b/bin/nova-api @@ -37,13 +37,13 @@ if os.path.exists(os.path.join(possible_topdir, "nova", "__init__.py")): from nova import flags -from nova import log as logging +from nova.openstack.common import log as logging from nova import service from nova import utils if __name__ == '__main__': flags.parse_args(sys.argv) - logging.setup() + logging.setup("nova") utils.monkey_patch() launcher = service.ProcessLauncher() for api in flags.FLAGS.enabled_apis: diff --git a/bin/nova-api-ec2 b/bin/nova-api-ec2 index f76f3dd7e311..8e66ab87489c 100755 --- a/bin/nova-api-ec2 +++ b/bin/nova-api-ec2 @@ -33,13 +33,13 @@ if os.path.exists(os.path.join(possible_topdir, "nova", "__init__.py")): from nova import flags -from nova import log as logging +from nova.openstack.common import log as logging from nova import service from nova import utils if __name__ == '__main__': flags.parse_args(sys.argv) - logging.setup() + logging.setup("nova") utils.monkey_patch() server = service.WSGIService('ec2') service.serve(server, workers=server.workers) diff --git a/bin/nova-api-metadata b/bin/nova-api-metadata index 2aad934536a7..d445a16a9799 100755 --- a/bin/nova-api-metadata +++ b/bin/nova-api-metadata @@ -33,13 +33,13 @@ if os.path.exists(os.path.join(possible_topdir, "nova", "__init__.py")): from nova import flags -from nova import log as logging +from nova.openstack.common import log as logging from nova import service from nova import utils if __name__ == '__main__': flags.parse_args(sys.argv) - logging.setup() + logging.setup("nova") utils.monkey_patch() server = service.WSGIService('metadata') service.serve(server, workers=server.workers) diff --git a/bin/nova-api-os-compute b/bin/nova-api-os-compute index c83855254095..529d5882125b 100755 --- a/bin/nova-api-os-compute +++ b/bin/nova-api-os-compute @@ -33,13 +33,13 @@ if os.path.exists(os.path.join(possible_topdir, "nova", "__init__.py")): from nova import flags -from nova import log as logging +from nova.openstack.common import log as logging from nova import service from nova import utils if __name__ == '__main__': flags.parse_args(sys.argv) - logging.setup() + logging.setup("nova") utils.monkey_patch() server = service.WSGIService('osapi_compute') service.serve(server, workers=server.workers) diff --git a/bin/nova-api-os-volume b/bin/nova-api-os-volume index f08c69384ed1..7c368fce9318 100755 --- a/bin/nova-api-os-volume +++ b/bin/nova-api-os-volume @@ -33,13 +33,13 @@ if os.path.exists(os.path.join(possible_topdir, "nova", "__init__.py")): from nova import flags -from nova import log as logging +from nova.openstack.common import log as logging from nova import service from nova import utils if __name__ == '__main__': flags.parse_args(sys.argv) - logging.setup() + logging.setup("nova") utils.monkey_patch() server = service.WSGIService('osapi_volume') service.serve(server, workers=server.workers) diff --git a/bin/nova-cert b/bin/nova-cert index a845c10558e5..81189492a9a4 100755 --- a/bin/nova-cert +++ b/bin/nova-cert @@ -33,13 +33,13 @@ if os.path.exists(os.path.join(POSSIBLE_TOPDIR, 'nova', '__init__.py')): from nova import flags -from nova import log as logging +from nova.openstack.common import log as logging from nova import service from nova import utils if __name__ == '__main__': flags.parse_args(sys.argv) - logging.setup() + logging.setup("nova") utils.monkey_patch() server = service.Service.create(binary='nova-cert') service.serve(server) diff --git a/bin/nova-clear-rabbit-queues b/bin/nova-clear-rabbit-queues index aff9da14ea5a..a2484c0b3a35 100755 --- a/bin/nova-clear-rabbit-queues +++ b/bin/nova-clear-rabbit-queues @@ -43,8 +43,8 @@ gettext.install('nova', unicode=1) from nova import context from nova import exception from nova import flags -from nova import log as logging from nova.openstack.common import cfg +from nova.openstack.common import log as logging from nova.openstack.common import rpc @@ -70,7 +70,7 @@ def delete_queues(queues): if __name__ == '__main__': args = flags.parse_args(sys.argv) - logging.setup() + logging.setup("nova") delete_queues(args[1:]) if FLAGS.delete_exchange: delete_exchange(FLAGS.control_exchange) diff --git a/bin/nova-compute b/bin/nova-compute index bef7bce8602a..0a8432b1e1c8 100755 --- a/bin/nova-compute +++ b/bin/nova-compute @@ -35,13 +35,13 @@ if os.path.exists(os.path.join(POSSIBLE_TOPDIR, 'nova', '__init__.py')): from nova import flags -from nova import log as logging +from nova.openstack.common import log as logging from nova import service from nova import utils if __name__ == '__main__': flags.parse_args(sys.argv) - logging.setup() + logging.setup('nova') utils.monkey_patch() server = service.Service.create(binary='nova-compute') service.serve(server) diff --git a/bin/nova-console b/bin/nova-console index f5a760b3744d..a40e84c92541 100755 --- a/bin/nova-console +++ b/bin/nova-console @@ -34,12 +34,12 @@ if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')): from nova import flags -from nova import log as logging +from nova.openstack.common import log as logging from nova import service if __name__ == '__main__': flags.parse_args(sys.argv) - logging.setup() + logging.setup("nova") server = service.Service.create(binary='nova-console') service.serve(server) service.wait() diff --git a/bin/nova-consoleauth b/bin/nova-consoleauth index 71d77b2855a7..082c7f6a2716 100755 --- a/bin/nova-consoleauth +++ b/bin/nova-consoleauth @@ -33,13 +33,13 @@ if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')): from nova.consoleauth import manager from nova import flags -from nova import log as logging +from nova.openstack.common import log as logging from nova import service if __name__ == "__main__": flags.parse_args(sys.argv) - logging.setup() + logging.setup("nova") server = service.Service.create(binary='nova-consoleauth') service.serve(server) diff --git a/bin/nova-dhcpbridge b/bin/nova-dhcpbridge index d5179d074e51..0693ae27a44d 100755 --- a/bin/nova-dhcpbridge +++ b/bin/nova-dhcpbridge @@ -38,9 +38,9 @@ gettext.install('nova', unicode=1) from nova import context from nova import db from nova import flags -from nova import log as logging from nova.network import linux_net from nova.openstack.common import importutils +from nova.openstack.common import log as logging from nova.openstack.common import rpc from nova import utils @@ -97,7 +97,7 @@ def main(): """Parse environment and arguments and call the approproate action.""" flagfile = os.environ.get('FLAGFILE', FLAGS.dhcpbridge_flagfile) argv = flags.parse_args(sys.argv) - logging.setup() + logging.setup("nova") if int(os.environ.get('TESTING', '0')): from nova.tests import fake_flags diff --git a/bin/nova-instance-usage-audit b/bin/nova-instance-usage-audit index 9fc71db056ad..1a7f34d6b9a7 100755 --- a/bin/nova-instance-usage-audit +++ b/bin/nova-instance-usage-audit @@ -55,7 +55,7 @@ from nova import context from nova import db from nova import exception from nova import flags -from nova import log as logging +from nova.openstack.common import log as logging from nova.openstack.common import rpc from nova import utils @@ -65,7 +65,7 @@ FLAGS = flags.FLAGS if __name__ == '__main__': admin_context = context.get_admin_context() flags.parse_args(sys.argv) - logging.setup() + logging.setup("nova") begin, end = utils.last_completed_audit_period() print "Starting instance usage audit" print "Creating usages for %s until %s" % (str(begin), str(end)) diff --git a/bin/nova-manage b/bin/nova-manage index bc9dd4cd489e..31b8669c54db 100755 --- a/bin/nova-manage +++ b/bin/nova-manage @@ -86,10 +86,10 @@ from nova import db from nova.db import migration from nova import exception from nova import flags -from nova import log as logging from nova.openstack.common import cfg from nova.openstack.common import importutils from nova.openstack.common import jsonutils +from nova.openstack.common import log as logging from nova.openstack.common import rpc from nova.openstack.common import timeutils from nova import quota @@ -1667,7 +1667,7 @@ def main(): try: argv = flags.parse_args(sys.argv) - logging.setup() + logging.setup("nova") except cfg.ConfigFilesNotFoundError: cfgfile = FLAGS.config_file[-1] if FLAGS.config_file else None if cfgfile and not os.access(cfgfile, os.R_OK): diff --git a/bin/nova-network b/bin/nova-network index 306eddafa656..ca9a97551500 100755 --- a/bin/nova-network +++ b/bin/nova-network @@ -35,13 +35,13 @@ if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')): from nova import flags -from nova import log as logging +from nova.openstack.common import log as logging from nova import service from nova import utils if __name__ == '__main__': flags.parse_args(sys.argv) - logging.setup() + logging.setup("nova") utils.monkey_patch() server = service.Service.create(binary='nova-network') service.serve(server) diff --git a/bin/nova-objectstore b/bin/nova-objectstore index e9bd0f42d807..2149b161098f 100755 --- a/bin/nova-objectstore +++ b/bin/nova-objectstore @@ -35,15 +35,15 @@ if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')): from nova import flags -from nova import log as logging from nova.objectstore import s3server +from nova.openstack.common import log as logging from nova import service from nova import utils if __name__ == '__main__': flags.parse_args(sys.argv) - logging.setup() + logging.setup("nova") utils.monkey_patch() server = s3server.get_wsgi_server() service.serve(server) diff --git a/bin/nova-rpc-zmq-receiver b/bin/nova-rpc-zmq-receiver index 2fe569b77087..5e5e6d8f75eb 100755 --- a/bin/nova-rpc-zmq-receiver +++ b/bin/nova-rpc-zmq-receiver @@ -45,7 +45,7 @@ CONF = cfg.CONF def main(): CONF.register_opts(rpc.rpc_opts) impl_zmq.register_opts(CONF) - logging.setup() + logging.setup("nova") utils.monkey_patch() ipc_dir = CONF.rpc_zmq_ipc_dir diff --git a/bin/nova-scheduler b/bin/nova-scheduler index fb803ab5bbaa..e100156df9e4 100755 --- a/bin/nova-scheduler +++ b/bin/nova-scheduler @@ -37,13 +37,13 @@ if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')): gettext.install('nova', unicode=1) from nova import flags -from nova import log as logging +from nova.openstack.common import log as logging from nova import service from nova import utils if __name__ == '__main__': flags.parse_args(sys.argv) - logging.setup() + logging.setup("nova") utils.monkey_patch() server = service.Service.create(binary='nova-scheduler') service.serve(server) diff --git a/bin/nova-volume b/bin/nova-volume index d8c13b9a6279..2c10c99f52f6 100755 --- a/bin/nova-volume +++ b/bin/nova-volume @@ -35,13 +35,13 @@ if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')): from nova import flags -from nova import log as logging +from nova.openstack.common import log as logging from nova import service from nova import utils if __name__ == '__main__': flags.parse_args(sys.argv) - logging.setup() + logging.setup("nova") utils.monkey_patch() server = service.Service.create(binary='nova-volume') service.serve(server) diff --git a/bin/nova-volume-usage-audit b/bin/nova-volume-usage-audit index aff650aa4448..735786f8f0f7 100755 --- a/bin/nova-volume-usage-audit +++ b/bin/nova-volume-usage-audit @@ -54,7 +54,7 @@ from nova import context from nova import db from nova import exception from nova import flags -from nova import log as logging +from nova.openstack.common import log as logging from nova.openstack.common import rpc from nova import utils from nova.volume import utils as volume_utils @@ -65,7 +65,7 @@ if __name__ == '__main__': admin_context = context.get_admin_context() utils.default_cfgfile() flags.FLAGS(sys.argv) - logging.setup() + logging.setup("nova") begin, end = utils.last_completed_audit_period() print "Starting volume usage audit" print "Creating usages for %s until %s" % (str(begin), str(end)) diff --git a/bin/nova-xvpvncproxy b/bin/nova-xvpvncproxy index 1e3708072c44..4a2f0ec116df 100755 --- a/bin/nova-xvpvncproxy +++ b/bin/nova-xvpvncproxy @@ -32,7 +32,7 @@ if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')): from nova import flags -from nova import log as logging +from nova.openstack.common import log as logging from nova.openstack.common import rpc from nova import service from nova.vnc import xvp_proxy @@ -41,7 +41,7 @@ FLAGS = flags.FLAGS if __name__ == "__main__": flags.parse_args(sys.argv) - logging.setup() + logging.setup("nova") wsgi_server = xvp_proxy.get_wsgi_server() service.serve(wsgi_server) diff --git a/etc/nova/logging_sample.conf b/etc/nova/logging_sample.conf index 403d70ed9ae0..ff8bc4a21a60 100644 --- a/etc/nova/logging_sample.conf +++ b/etc/nova/logging_sample.conf @@ -70,7 +70,7 @@ formatter = default args = () [formatter_legacynova] -class = nova.log.LegacyNovaFormatter +class = nova.log.LegacyFormatter [formatter_default] format = %(message)s diff --git a/nova/api/auth.py b/nova/api/auth.py index 72eba1d9cacb..d8b5342c6737 100644 --- a/nova/api/auth.py +++ b/nova/api/auth.py @@ -23,8 +23,8 @@ import webob.exc from nova import context from nova import flags -from nova import log as logging from nova.openstack.common import cfg +from nova.openstack.common import log as logging from nova import wsgi diff --git a/nova/api/ec2/__init__.py b/nova/api/ec2/__init__.py index 6bb19e7b3b7f..11fa9d6d5a3c 100644 --- a/nova/api/ec2/__init__.py +++ b/nova/api/ec2/__init__.py @@ -34,10 +34,10 @@ from nova.api import validator from nova import context from nova import exception from nova import flags -from nova import log as logging from nova.openstack.common import cfg from nova.openstack.common import importutils from nova.openstack.common import jsonutils +from nova.openstack.common import log as logging from nova.openstack.common import timeutils from nova import utils from nova import wsgi diff --git a/nova/api/ec2/apirequest.py b/nova/api/ec2/apirequest.py index c76549562aa6..70b1e3b80494 100644 --- a/nova/api/ec2/apirequest.py +++ b/nova/api/ec2/apirequest.py @@ -27,7 +27,7 @@ from xml.dom import minidom from nova.api.ec2 import ec2utils from nova import exception from nova import flags -from nova import log as logging +from nova.openstack.common import log as logging LOG = logging.getLogger(__name__) FLAGS = flags.FLAGS diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py index 126df0f0a101..c632d7ac2c01 100644 --- a/nova/api/ec2/cloud.py +++ b/nova/api/ec2/cloud.py @@ -37,9 +37,9 @@ from nova import db from nova import exception from nova import flags from nova.image import s3 -from nova import log as logging from nova import network from nova.openstack.common import excutils +from nova.openstack.common import log as logging from nova.openstack.common import timeutils from nova import quota from nova import utils diff --git a/nova/api/ec2/ec2utils.py b/nova/api/ec2/ec2utils.py index 6086282093da..e1ea9c6d80ce 100644 --- a/nova/api/ec2/ec2utils.py +++ b/nova/api/ec2/ec2utils.py @@ -22,8 +22,8 @@ from nova import context from nova import db from nova import exception from nova import flags -from nova import log as logging from nova.network import model as network_model +from nova.openstack.common import log as logging from nova import utils diff --git a/nova/api/metadata/base.py b/nova/api/metadata/base.py index 582bdec82bc0..ee6e28208769 100644 --- a/nova/api/metadata/base.py +++ b/nova/api/metadata/base.py @@ -28,8 +28,8 @@ from nova import context from nova import db from nova import exception from nova import flags -from nova import log as logging from nova import network +from nova.openstack.common import log as logging from nova import volume FLAGS = flags.FLAGS diff --git a/nova/api/metadata/handler.py b/nova/api/metadata/handler.py index 59a7d030e095..d022cbc82e74 100644 --- a/nova/api/metadata/handler.py +++ b/nova/api/metadata/handler.py @@ -25,7 +25,7 @@ import webob.exc from nova.api.metadata import base from nova import exception from nova import flags -from nova import log as logging +from nova.openstack.common import log as logging from nova import wsgi LOG = logging.getLogger(__name__) diff --git a/nova/api/openstack/__init__.py b/nova/api/openstack/__init__.py index 82e958a5972d..afeed0399e75 100644 --- a/nova/api/openstack/__init__.py +++ b/nova/api/openstack/__init__.py @@ -25,7 +25,7 @@ import webob.dec import webob.exc from nova.api.openstack import wsgi -from nova import log as logging +from nova.openstack.common import log as logging from nova import wsgi as base_wsgi diff --git a/nova/api/openstack/auth.py b/nova/api/openstack/auth.py index 9e9e4d9787ab..078d586393a2 100644 --- a/nova/api/openstack/auth.py +++ b/nova/api/openstack/auth.py @@ -23,7 +23,7 @@ import webob.exc from nova.api.openstack import wsgi from nova import context from nova import flags -from nova import log as logging +from nova.openstack.common import log as logging from nova import wsgi as base_wsgi LOG = logging.getLogger(__name__) diff --git a/nova/api/openstack/common.py b/nova/api/openstack/common.py index b8e013f98181..88c81a5780e1 100644 --- a/nova/api/openstack/common.py +++ b/nova/api/openstack/common.py @@ -30,7 +30,7 @@ from nova.compute import utils as compute_utils from nova.compute import vm_states from nova import exception from nova import flags -from nova import log as logging +from nova.openstack.common import log as logging from nova import quota diff --git a/nova/api/openstack/compute/__init__.py b/nova/api/openstack/compute/__init__.py index f52234cf12ed..081290b10bd4 100644 --- a/nova/api/openstack/compute/__init__.py +++ b/nova/api/openstack/compute/__init__.py @@ -32,8 +32,8 @@ from nova.api.openstack.compute import server_metadata from nova.api.openstack.compute import servers from nova.api.openstack.compute import versions from nova import flags -from nova import log as logging from nova.openstack.common import cfg +from nova.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/nova/api/openstack/compute/contrib/__init__.py b/nova/api/openstack/compute/contrib/__init__.py index 4d02ecf7e71e..d44254eb6b25 100644 --- a/nova/api/openstack/compute/contrib/__init__.py +++ b/nova/api/openstack/compute/contrib/__init__.py @@ -23,7 +23,7 @@ It can't be called 'extensions' because that causes namespacing problems. from nova.api.openstack import extensions from nova import flags -from nova import log as logging +from nova.openstack.common import log as logging FLAGS = flags.FLAGS diff --git a/nova/api/openstack/compute/contrib/accounts.py b/nova/api/openstack/compute/contrib/accounts.py index 1498ed1c56ec..e407015c2aa3 100644 --- a/nova/api/openstack/compute/contrib/accounts.py +++ b/nova/api/openstack/compute/contrib/accounts.py @@ -21,7 +21,7 @@ from nova.api.openstack import xmlutil from nova.auth import manager from nova import exception from nova import flags -from nova import log as logging +from nova.openstack.common import log as logging FLAGS = flags.FLAGS diff --git a/nova/api/openstack/compute/contrib/admin_actions.py b/nova/api/openstack/compute/contrib/admin_actions.py index 72815ed0065b..8432f02fca5c 100644 --- a/nova/api/openstack/compute/contrib/admin_actions.py +++ b/nova/api/openstack/compute/contrib/admin_actions.py @@ -25,7 +25,7 @@ from nova import compute from nova.compute import vm_states from nova import exception from nova import flags -from nova import log as logging +from nova.openstack.common import log as logging FLAGS = flags.FLAGS diff --git a/nova/api/openstack/compute/contrib/aggregates.py b/nova/api/openstack/compute/contrib/aggregates.py index aa10fe5321b7..834131f92ea1 100644 --- a/nova/api/openstack/compute/contrib/aggregates.py +++ b/nova/api/openstack/compute/contrib/aggregates.py @@ -20,7 +20,7 @@ from webob import exc from nova.api.openstack import extensions from nova.compute import api as compute_api from nova import exception -from nova import log as logging +from nova.openstack.common import log as logging LOG = logging.getLogger(__name__) authorize = extensions.extension_authorizer('compute', 'aggregates') diff --git a/nova/api/openstack/compute/contrib/certificates.py b/nova/api/openstack/compute/contrib/certificates.py index 554ff10d8b0a..ccc6b84a2e06 100644 --- a/nova/api/openstack/compute/contrib/certificates.py +++ b/nova/api/openstack/compute/contrib/certificates.py @@ -21,8 +21,8 @@ from nova.api.openstack import wsgi from nova.api.openstack import xmlutil import nova.cert.rpcapi from nova import flags -from nova import log as logging from nova import network +from nova.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/nova/api/openstack/compute/contrib/cloudpipe.py b/nova/api/openstack/compute/contrib/cloudpipe.py index 321123d76c4b..a2faf833b624 100644 --- a/nova/api/openstack/compute/contrib/cloudpipe.py +++ b/nova/api/openstack/compute/contrib/cloudpipe.py @@ -27,8 +27,8 @@ from nova.compute import vm_states from nova import db from nova import exception from nova import flags -from nova import log as logging from nova import network +from nova.openstack.common import log as logging from nova.openstack.common import timeutils from nova import utils diff --git a/nova/api/openstack/compute/contrib/console_output.py b/nova/api/openstack/compute/contrib/console_output.py index fd1e9418c7bb..7a16daec30e1 100644 --- a/nova/api/openstack/compute/contrib/console_output.py +++ b/nova/api/openstack/compute/contrib/console_output.py @@ -23,7 +23,7 @@ from nova.api.openstack import extensions from nova.api.openstack import wsgi from nova import compute from nova import exception -from nova import log as logging +from nova.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/nova/api/openstack/compute/contrib/consoles.py b/nova/api/openstack/compute/contrib/consoles.py index 915ca5c876ab..ef61d39667ab 100644 --- a/nova/api/openstack/compute/contrib/consoles.py +++ b/nova/api/openstack/compute/contrib/consoles.py @@ -20,7 +20,7 @@ from nova.api.openstack import extensions from nova.api.openstack import wsgi from nova import compute from nova import exception -from nova import log as logging +from nova.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/nova/api/openstack/compute/contrib/deferred_delete.py b/nova/api/openstack/compute/contrib/deferred_delete.py index 8ba23a663207..8eaea04bbdb6 100644 --- a/nova/api/openstack/compute/contrib/deferred_delete.py +++ b/nova/api/openstack/compute/contrib/deferred_delete.py @@ -22,7 +22,7 @@ from nova.api.openstack import extensions from nova.api.openstack import wsgi from nova import compute from nova import exception -from nova import log as logging +from nova.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/nova/api/openstack/compute/contrib/extended_server_attributes.py b/nova/api/openstack/compute/contrib/extended_server_attributes.py index 46d4df2d14b7..f1ec9b956684 100644 --- a/nova/api/openstack/compute/contrib/extended_server_attributes.py +++ b/nova/api/openstack/compute/contrib/extended_server_attributes.py @@ -20,7 +20,7 @@ from nova.api.openstack import xmlutil from nova import compute from nova import db from nova import flags -from nova import log as logging +from nova.openstack.common import log as logging FLAGS = flags.FLAGS diff --git a/nova/api/openstack/compute/contrib/extended_status.py b/nova/api/openstack/compute/contrib/extended_status.py index d17319c679fd..d88f4e14b986 100644 --- a/nova/api/openstack/compute/contrib/extended_status.py +++ b/nova/api/openstack/compute/contrib/extended_status.py @@ -19,7 +19,7 @@ from nova.api.openstack import wsgi from nova.api.openstack import xmlutil from nova import compute from nova import flags -from nova import log as logging +from nova.openstack.common import log as logging FLAGS = flags.FLAGS diff --git a/nova/api/openstack/compute/contrib/flavormanage.py b/nova/api/openstack/compute/contrib/flavormanage.py index 547760e94a71..4dedcf981c60 100644 --- a/nova/api/openstack/compute/contrib/flavormanage.py +++ b/nova/api/openstack/compute/contrib/flavormanage.py @@ -20,7 +20,7 @@ from nova.api.openstack import extensions from nova.api.openstack import wsgi from nova.compute import instance_types from nova import exception -from nova import log as logging +from nova.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/nova/api/openstack/compute/contrib/floating_ip_dns.py b/nova/api/openstack/compute/contrib/floating_ip_dns.py index a8a7a2a231f3..788d83b2daf9 100644 --- a/nova/api/openstack/compute/contrib/floating_ip_dns.py +++ b/nova/api/openstack/compute/contrib/floating_ip_dns.py @@ -22,8 +22,8 @@ from nova.api.openstack import extensions from nova.api.openstack import wsgi from nova.api.openstack import xmlutil from nova import exception -from nova import log as logging from nova import network +from nova.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/nova/api/openstack/compute/contrib/floating_ip_pools.py b/nova/api/openstack/compute/contrib/floating_ip_pools.py index 7265d8611c86..216bc9091ee6 100644 --- a/nova/api/openstack/compute/contrib/floating_ip_pools.py +++ b/nova/api/openstack/compute/contrib/floating_ip_pools.py @@ -17,8 +17,8 @@ from nova.api.openstack import extensions from nova.api.openstack import wsgi from nova.api.openstack import xmlutil -from nova import log as logging from nova import network +from nova.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/nova/api/openstack/compute/contrib/floating_ips.py b/nova/api/openstack/compute/contrib/floating_ips.py index 0b7fa881eae6..ed5f61d53e26 100644 --- a/nova/api/openstack/compute/contrib/floating_ips.py +++ b/nova/api/openstack/compute/contrib/floating_ips.py @@ -25,8 +25,8 @@ from nova.api.openstack import xmlutil from nova import compute from nova.compute import utils as compute_utils from nova import exception -from nova import log as logging from nova import network +from nova.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/nova/api/openstack/compute/contrib/hosts.py b/nova/api/openstack/compute/contrib/hosts.py index e24ef360515e..95a80f3f6d04 100644 --- a/nova/api/openstack/compute/contrib/hosts.py +++ b/nova/api/openstack/compute/contrib/hosts.py @@ -26,7 +26,7 @@ from nova.compute import api as compute_api from nova import db from nova import exception from nova import flags -from nova import log as logging +from nova.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/nova/api/openstack/compute/contrib/hypervisors.py b/nova/api/openstack/compute/contrib/hypervisors.py index 6686de5a9bf1..084d87575736 100644 --- a/nova/api/openstack/compute/contrib/hypervisors.py +++ b/nova/api/openstack/compute/contrib/hypervisors.py @@ -22,7 +22,7 @@ from nova.api.openstack import wsgi from nova.api.openstack import xmlutil from nova import db from nova import exception -from nova import log as logging +from nova.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/nova/api/openstack/compute/contrib/multinic.py b/nova/api/openstack/compute/contrib/multinic.py index 02e87edf25d7..29409c050334 100644 --- a/nova/api/openstack/compute/contrib/multinic.py +++ b/nova/api/openstack/compute/contrib/multinic.py @@ -22,7 +22,7 @@ from nova.api.openstack import extensions from nova.api.openstack import wsgi from nova import compute from nova import exception -from nova import log as logging +from nova.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/nova/api/openstack/compute/contrib/networks.py b/nova/api/openstack/compute/contrib/networks.py index 20e481bc7e18..ece331fbbb01 100644 --- a/nova/api/openstack/compute/contrib/networks.py +++ b/nova/api/openstack/compute/contrib/networks.py @@ -22,8 +22,8 @@ from webob import exc from nova.api.openstack import extensions from nova import exception from nova import flags -from nova import log as logging import nova.network.api +from nova.openstack.common import log as logging FLAGS = flags.FLAGS diff --git a/nova/api/openstack/compute/contrib/rescue.py b/nova/api/openstack/compute/contrib/rescue.py index 7bf815a37979..918f17100c88 100644 --- a/nova/api/openstack/compute/contrib/rescue.py +++ b/nova/api/openstack/compute/contrib/rescue.py @@ -23,7 +23,7 @@ from nova.api.openstack import wsgi from nova import compute from nova import exception from nova import flags -from nova import log as logging +from nova.openstack.common import log as logging from nova import utils diff --git a/nova/api/openstack/compute/contrib/scheduler_hints.py b/nova/api/openstack/compute/contrib/scheduler_hints.py index 9e0b3ea3a0c5..86b7564bdcb1 100644 --- a/nova/api/openstack/compute/contrib/scheduler_hints.py +++ b/nova/api/openstack/compute/contrib/scheduler_hints.py @@ -18,7 +18,7 @@ import webob.exc from nova.api.openstack import extensions from nova.api.openstack import wsgi -import nova.log as logging +import nova.openstack.common.log as logging LOG = logging.getLogger(__name__) diff --git a/nova/api/openstack/compute/contrib/security_groups.py b/nova/api/openstack/compute/contrib/security_groups.py index 840813d6840c..004df4e7357e 100644 --- a/nova/api/openstack/compute/contrib/security_groups.py +++ b/nova/api/openstack/compute/contrib/security_groups.py @@ -29,8 +29,8 @@ from nova import compute from nova import db from nova import exception from nova import flags -from nova import log as logging from nova.openstack.common import excutils +from nova.openstack.common import log as logging from nova import utils diff --git a/nova/api/openstack/compute/contrib/server_start_stop.py b/nova/api/openstack/compute/contrib/server_start_stop.py index ca905d496dcc..049fa393b103 100644 --- a/nova/api/openstack/compute/contrib/server_start_stop.py +++ b/nova/api/openstack/compute/contrib/server_start_stop.py @@ -20,7 +20,7 @@ from nova.api.openstack import extensions from nova.api.openstack import wsgi from nova import compute from nova import exception -from nova import log as logging +from nova.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/nova/api/openstack/compute/contrib/users.py b/nova/api/openstack/compute/contrib/users.py index 8eb9b9c5b0a8..12013f0141a9 100644 --- a/nova/api/openstack/compute/contrib/users.py +++ b/nova/api/openstack/compute/contrib/users.py @@ -22,7 +22,7 @@ from nova.api.openstack import xmlutil from nova.auth import manager from nova import exception from nova import flags -from nova import log as logging +from nova.openstack.common import log as logging FLAGS = flags.FLAGS diff --git a/nova/api/openstack/compute/contrib/virtual_interfaces.py b/nova/api/openstack/compute/contrib/virtual_interfaces.py index e7c0a873589b..f4f14dc821b3 100644 --- a/nova/api/openstack/compute/contrib/virtual_interfaces.py +++ b/nova/api/openstack/compute/contrib/virtual_interfaces.py @@ -20,8 +20,8 @@ from nova.api.openstack import extensions from nova.api.openstack import wsgi from nova.api.openstack import xmlutil from nova import compute -from nova import log as logging from nova import network +from nova.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/nova/api/openstack/compute/contrib/volumes.py b/nova/api/openstack/compute/contrib/volumes.py index a51ba92291db..6b04e3240fc6 100644 --- a/nova/api/openstack/compute/contrib/volumes.py +++ b/nova/api/openstack/compute/contrib/volumes.py @@ -26,7 +26,7 @@ from nova.api.openstack import xmlutil from nova import compute from nova import exception from nova import flags -from nova import log as logging +from nova.openstack.common import log as logging from nova import volume from nova.volume import volume_types diff --git a/nova/api/openstack/compute/extensions.py b/nova/api/openstack/compute/extensions.py index b52e89ab52ee..cb5e89deb0b0 100644 --- a/nova/api/openstack/compute/extensions.py +++ b/nova/api/openstack/compute/extensions.py @@ -17,7 +17,7 @@ from nova.api.openstack import extensions as base_extensions from nova import flags -from nova import log as logging +from nova.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/nova/api/openstack/compute/images.py b/nova/api/openstack/compute/images.py index 35d21da6008f..1b20531def22 100644 --- a/nova/api/openstack/compute/images.py +++ b/nova/api/openstack/compute/images.py @@ -22,7 +22,7 @@ from nova.api.openstack import xmlutil from nova import exception from nova import flags import nova.image.glance -from nova import log as logging +from nova.openstack.common import log as logging import nova.utils diff --git a/nova/api/openstack/compute/ips.py b/nova/api/openstack/compute/ips.py index 3afb206fa9f1..6ad888fd720b 100644 --- a/nova/api/openstack/compute/ips.py +++ b/nova/api/openstack/compute/ips.py @@ -23,7 +23,7 @@ from nova.api.openstack.compute.views import addresses as view_addresses from nova.api.openstack import wsgi from nova.api.openstack import xmlutil from nova import flags -from nova import log as logging +from nova.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/nova/api/openstack/compute/servers.py b/nova/api/openstack/compute/servers.py index 5a8e1f645e28..ca87f3d4af22 100644 --- a/nova/api/openstack/compute/servers.py +++ b/nova/api/openstack/compute/servers.py @@ -31,7 +31,7 @@ from nova import compute from nova.compute import instance_types from nova import exception from nova import flags -from nova import log as logging +from nova.openstack.common import log as logging from nova.openstack.common.rpc import common as rpc_common from nova.openstack.common import timeutils from nova import utils diff --git a/nova/api/openstack/compute/views/addresses.py b/nova/api/openstack/compute/views/addresses.py index 794feb5bad6a..41d1d0730f4f 100644 --- a/nova/api/openstack/compute/views/addresses.py +++ b/nova/api/openstack/compute/views/addresses.py @@ -19,7 +19,7 @@ import itertools from nova.api.openstack import common from nova import flags -from nova import log as logging +from nova.openstack.common import log as logging FLAGS = flags.FLAGS diff --git a/nova/api/openstack/compute/views/servers.py b/nova/api/openstack/compute/views/servers.py index b0c2fb2b2aa6..9aaf96fe3256 100644 --- a/nova/api/openstack/compute/views/servers.py +++ b/nova/api/openstack/compute/views/servers.py @@ -22,7 +22,7 @@ from nova.api.openstack import common from nova.api.openstack.compute.views import addresses as views_addresses from nova.api.openstack.compute.views import flavors as views_flavors from nova.api.openstack.compute.views import images as views_images -from nova import log as logging +from nova.openstack.common import log as logging from nova.openstack.common import timeutils diff --git a/nova/api/openstack/extensions.py b/nova/api/openstack/extensions.py index 93accab93f48..be7304e6ed6b 100644 --- a/nova/api/openstack/extensions.py +++ b/nova/api/openstack/extensions.py @@ -26,8 +26,8 @@ from nova.api.openstack import wsgi from nova.api.openstack import xmlutil from nova import exception from nova import flags -from nova import log as logging from nova.openstack.common import importutils +from nova.openstack.common import log as logging import nova.policy diff --git a/nova/api/openstack/urlmap.py b/nova/api/openstack/urlmap.py index 6f3c484ec866..aa49226b383d 100644 --- a/nova/api/openstack/urlmap.py +++ b/nova/api/openstack/urlmap.py @@ -20,7 +20,7 @@ import re import urllib2 from nova.api.openstack import wsgi -from nova import log as logging +from nova.openstack.common import log as logging _quoted_string_re = r'"[^"\\]*(?:\\.[^"\\]*)*"' diff --git a/nova/api/openstack/volume/__init__.py b/nova/api/openstack/volume/__init__.py index 0f529980f822..3e6f731e1b49 100644 --- a/nova/api/openstack/volume/__init__.py +++ b/nova/api/openstack/volume/__init__.py @@ -26,7 +26,7 @@ from nova.api.openstack.volume import snapshots from nova.api.openstack.volume import types from nova.api.openstack.volume import versions from nova.api.openstack.volume import volumes -from nova import log as logging +from nova.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/nova/api/openstack/volume/contrib/__init__.py b/nova/api/openstack/volume/contrib/__init__.py index 1eba0b4dfafb..8e01d88d0bcf 100644 --- a/nova/api/openstack/volume/contrib/__init__.py +++ b/nova/api/openstack/volume/contrib/__init__.py @@ -23,7 +23,7 @@ It can't be called 'extensions' because that causes namespacing problems. from nova.api.openstack import extensions from nova import flags -from nova import log as logging +from nova.openstack.common import log as logging FLAGS = flags.FLAGS diff --git a/nova/api/openstack/volume/extensions.py b/nova/api/openstack/volume/extensions.py index fa7fc1a77e29..cf400bd9a2a4 100644 --- a/nova/api/openstack/volume/extensions.py +++ b/nova/api/openstack/volume/extensions.py @@ -17,7 +17,7 @@ from nova.api.openstack import extensions as base_extensions from nova import flags -from nova import log as logging +from nova.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/nova/api/openstack/volume/snapshots.py b/nova/api/openstack/volume/snapshots.py index 11681f6e8047..209f78d13323 100644 --- a/nova/api/openstack/volume/snapshots.py +++ b/nova/api/openstack/volume/snapshots.py @@ -23,7 +23,7 @@ from nova.api.openstack import wsgi from nova.api.openstack import xmlutil from nova import exception from nova import flags -from nova import log as logging +from nova.openstack.common import log as logging from nova import volume diff --git a/nova/api/openstack/volume/volumes.py b/nova/api/openstack/volume/volumes.py index 4c50a6d2ea4a..1b0c8dfcadc4 100644 --- a/nova/api/openstack/volume/volumes.py +++ b/nova/api/openstack/volume/volumes.py @@ -23,7 +23,7 @@ from nova.api.openstack import wsgi from nova.api.openstack import xmlutil from nova import exception from nova import flags -from nova import log as logging +from nova.openstack.common import log as logging from nova import volume from nova.volume import volume_types diff --git a/nova/api/openstack/wsgi.py b/nova/api/openstack/wsgi.py index 4f78a4697fb0..fb25c5caae9a 100644 --- a/nova/api/openstack/wsgi.py +++ b/nova/api/openstack/wsgi.py @@ -25,8 +25,8 @@ from lxml import etree import webob from nova import exception -from nova import log as logging from nova.openstack.common import jsonutils +from nova.openstack.common import log as logging from nova import wsgi diff --git a/nova/api/sizelimit.py b/nova/api/sizelimit.py index a948a1e8abaf..6c991408d80e 100644 --- a/nova/api/sizelimit.py +++ b/nova/api/sizelimit.py @@ -22,8 +22,8 @@ import webob.dec import webob.exc from nova import flags -from nova import log as logging from nova.openstack.common import cfg +from nova.openstack.common import log as logging from nova import wsgi diff --git a/nova/auth/ldapdriver.py b/nova/auth/ldapdriver.py index 3f36d97b6289..ac4fcf4b52c8 100644 --- a/nova/auth/ldapdriver.py +++ b/nova/auth/ldapdriver.py @@ -29,8 +29,8 @@ import sys from nova import exception from nova import flags -from nova import log as logging from nova.openstack.common import cfg +from nova.openstack.common import log as logging ldap_opts = [ diff --git a/nova/auth/manager.py b/nova/auth/manager.py index c4e438daf1df..8aa3adeabc50 100644 --- a/nova/auth/manager.py +++ b/nova/auth/manager.py @@ -34,9 +34,9 @@ from nova import crypto from nova import db from nova import exception from nova import flags -from nova import log as logging from nova.openstack.common import cfg from nova.openstack.common import importutils +from nova.openstack.common import log as logging from nova import utils diff --git a/nova/auth/signer.py b/nova/auth/signer.py index 05be345592e3..0892aeb9a8fd 100644 --- a/nova/auth/signer.py +++ b/nova/auth/signer.py @@ -59,7 +59,7 @@ except ImportError: boto = None from nova import exception -from nova import log as logging +from nova.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/nova/cert/manager.py b/nova/cert/manager.py index 992f5d96b042..a7cb6cc12ae3 100644 --- a/nova/cert/manager.py +++ b/nova/cert/manager.py @@ -28,8 +28,8 @@ import base64 from nova import crypto from nova import flags -from nova import log as logging from nova import manager +from nova.openstack.common import log as logging LOG = logging.getLogger(__name__) FLAGS = flags.FLAGS diff --git a/nova/cloudpipe/pipelib.py b/nova/cloudpipe/pipelib.py index 0f9f782b082c..6926978fcc26 100644 --- a/nova/cloudpipe/pipelib.py +++ b/nova/cloudpipe/pipelib.py @@ -34,8 +34,8 @@ from nova import crypto from nova import db from nova import exception from nova import flags -from nova import log as logging from nova.openstack.common import cfg +from nova.openstack.common import log as logging from nova import utils diff --git a/nova/common/deprecated.py b/nova/common/deprecated.py index a442c1506505..feef86d980f8 100644 --- a/nova/common/deprecated.py +++ b/nova/common/deprecated.py @@ -16,8 +16,8 @@ from nova import exception from nova import flags -from nova import log as logging from nova.openstack.common import cfg +from nova.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/nova/compute/api.py b/nova/compute/api.py index 1e3ebf1f3bc4..771ed8b17e31 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -40,12 +40,12 @@ from nova.db import base from nova import exception from nova import flags from nova.image import glance -from nova import log as logging from nova import network from nova import notifications from nova.openstack.common import excutils from nova.openstack.common import importutils from nova.openstack.common import jsonutils +from nova.openstack.common import log as logging from nova.openstack.common import timeutils import nova.policy from nova import quota diff --git a/nova/compute/instance_types.py b/nova/compute/instance_types.py index d06252a6b1e4..dfcf235dd788 100644 --- a/nova/compute/instance_types.py +++ b/nova/compute/instance_types.py @@ -26,7 +26,7 @@ from nova import context from nova import db from nova import exception from nova import flags -from nova import log as logging +from nova.openstack.common import log as logging FLAGS = flags.FLAGS LOG = logging.getLogger(__name__) diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 3cdf35266ca5..9253303f8509 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -58,7 +58,6 @@ import nova.context from nova import exception from nova import flags from nova.image import glance -from nova import log as logging from nova import manager from nova import network from nova.network import model as network_model @@ -68,6 +67,7 @@ from nova.openstack.common import cfg from nova.openstack.common import excutils from nova.openstack.common import importutils from nova.openstack.common import jsonutils +from nova.openstack.common import log as logging from nova.openstack.common import rpc from nova.openstack.common import timeutils from nova import utils diff --git a/nova/compute/utils.py b/nova/compute/utils.py index d5905f7e7a1c..f0bfe7646a46 100644 --- a/nova/compute/utils.py +++ b/nova/compute/utils.py @@ -19,10 +19,10 @@ from nova import db from nova import exception from nova import flags -from nova import log from nova.network import model as network_model from nova import notifications from nova.notifier import api as notifier_api +from nova.openstack.common import log FLAGS = flags.FLAGS diff --git a/nova/console/manager.py b/nova/console/manager.py index bc589429098c..ddb564f06028 100644 --- a/nova/console/manager.py +++ b/nova/console/manager.py @@ -22,10 +22,10 @@ import socket from nova.compute import rpcapi as compute_rpcapi from nova import exception from nova import flags -from nova import log as logging from nova import manager from nova.openstack.common import cfg from nova.openstack.common import importutils +from nova.openstack.common import log as logging from nova import utils diff --git a/nova/console/vmrc_manager.py b/nova/console/vmrc_manager.py index cb6fd51adca6..70cc6caeee6d 100644 --- a/nova/console/vmrc_manager.py +++ b/nova/console/vmrc_manager.py @@ -20,10 +20,10 @@ from nova.compute import rpcapi as compute_rpcapi from nova import exception from nova import flags -from nova import log as logging from nova import manager from nova.openstack.common import cfg from nova.openstack.common import importutils +from nova.openstack.common import log as logging from nova.virt import vmwareapi_conn diff --git a/nova/console/xvp.py b/nova/console/xvp.py index 9017c55cd1db..60197c766f88 100644 --- a/nova/console/xvp.py +++ b/nova/console/xvp.py @@ -26,8 +26,8 @@ from nova import context from nova import db from nova import exception from nova import flags -from nova import log as logging from nova.openstack.common import cfg +from nova.openstack.common import log as logging from nova import utils diff --git a/nova/consoleauth/manager.py b/nova/consoleauth/manager.py index 049ce1fceeea..c78554c870dc 100644 --- a/nova/consoleauth/manager.py +++ b/nova/consoleauth/manager.py @@ -21,10 +21,10 @@ import time from nova import flags -from nova import log as logging from nova import manager from nova.openstack.common import cfg from nova.openstack.common import jsonutils +from nova.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/nova/context.py b/nova/context.py index f2bb6b5d60aa..cb3ee5ebc330 100644 --- a/nova/context.py +++ b/nova/context.py @@ -21,8 +21,8 @@ import copy -from nova import log as logging from nova.openstack.common import local +from nova.openstack.common import log as logging from nova.openstack.common import timeutils from nova import utils diff --git a/nova/crypto.py b/nova/crypto.py index eb9e36c70313..dfab2cd55bfb 100644 --- a/nova/crypto.py +++ b/nova/crypto.py @@ -35,8 +35,8 @@ from nova import context from nova import db from nova import exception from nova import flags -from nova import log as logging from nova.openstack.common import cfg +from nova.openstack.common import log as logging from nova.openstack.common import timeutils from nova import utils diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index 9bf3a0e12a4f..f9f9e2228b9e 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -33,7 +33,7 @@ from nova.db.sqlalchemy import models from nova.db.sqlalchemy.session import get_session from nova import exception from nova import flags -from nova import log as logging +from nova.openstack.common import log as logging from nova.openstack.common import timeutils from nova import utils from sqlalchemy import and_ diff --git a/nova/db/sqlalchemy/migrate_repo/versions/082_essex.py b/nova/db/sqlalchemy/migrate_repo/versions/082_essex.py index 9a68ee116da9..4e60487148fd 100644 --- a/nova/db/sqlalchemy/migrate_repo/versions/082_essex.py +++ b/nova/db/sqlalchemy/migrate_repo/versions/082_essex.py @@ -19,7 +19,7 @@ from sqlalchemy import Boolean, BigInteger, Column, DateTime, Float, ForeignKey from sqlalchemy import Index, Integer, MetaData, String, Table, Text from nova import flags -from nova import log as logging +from nova.openstack.common import log as logging FLAGS = flags.FLAGS diff --git a/nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py b/nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py index 2f3b2ecc1d91..d08afd16e68f 100644 --- a/nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py +++ b/nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py @@ -17,7 +17,7 @@ from sqlalchemy import Boolean, Column, DateTime from sqlalchemy import MetaData, Integer, String, Table -from nova import log as logging +from nova.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/nova/db/sqlalchemy/migrate_repo/versions/087_add_uuid_to_bw_usage_cache.py b/nova/db/sqlalchemy/migrate_repo/versions/087_add_uuid_to_bw_usage_cache.py index 1c4ac264208d..1be008ec3262 100644 --- a/nova/db/sqlalchemy/migrate_repo/versions/087_add_uuid_to_bw_usage_cache.py +++ b/nova/db/sqlalchemy/migrate_repo/versions/087_add_uuid_to_bw_usage_cache.py @@ -17,7 +17,7 @@ from sqlalchemy import Boolean, Column, DateTime, BigInteger from sqlalchemy import MetaData, Integer, String, Table -from nova import log as logging +from nova.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/nova/db/sqlalchemy/migrate_repo/versions/088_change_instance_id_to_uuid_in_block_device_mapping.py b/nova/db/sqlalchemy/migrate_repo/versions/088_change_instance_id_to_uuid_in_block_device_mapping.py index 46fd7467f070..52a34088954e 100644 --- a/nova/db/sqlalchemy/migrate_repo/versions/088_change_instance_id_to_uuid_in_block_device_mapping.py +++ b/nova/db/sqlalchemy/migrate_repo/versions/088_change_instance_id_to_uuid_in_block_device_mapping.py @@ -20,7 +20,7 @@ from migrate import ForeignKeyConstraint from sqlalchemy import MetaData, String, Table from sqlalchemy import select, Column, ForeignKey, Integer -from nova import log as logging +from nova.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/nova/db/sqlalchemy/migrate_repo/versions/089_add_volume_id_mappings.py b/nova/db/sqlalchemy/migrate_repo/versions/089_add_volume_id_mappings.py index 120d22707b2d..1dd47aec24eb 100644 --- a/nova/db/sqlalchemy/migrate_repo/versions/089_add_volume_id_mappings.py +++ b/nova/db/sqlalchemy/migrate_repo/versions/089_add_volume_id_mappings.py @@ -18,7 +18,7 @@ from sqlalchemy import Boolean, Column, DateTime, Integer from sqlalchemy import MetaData, String, Table -from nova import log as logging +from nova.openstack.common import log as logging from nova import utils LOG = logging.getLogger(__name__) diff --git a/nova/db/sqlalchemy/migrate_repo/versions/090_modify_volume_id_datatype.py b/nova/db/sqlalchemy/migrate_repo/versions/090_modify_volume_id_datatype.py index 3366ebc3c5ef..4a2ba2d475c4 100644 --- a/nova/db/sqlalchemy/migrate_repo/versions/090_modify_volume_id_datatype.py +++ b/nova/db/sqlalchemy/migrate_repo/versions/090_modify_volume_id_datatype.py @@ -19,7 +19,8 @@ from migrate import ForeignKeyConstraint from sqlalchemy import Integer from sqlalchemy import MetaData, String, Table -from nova import log as logging +from migrate import ForeignKeyConstraint +from nova.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/nova/db/sqlalchemy/migrate_repo/versions/091_convert_volume_ids_to_uuid.py b/nova/db/sqlalchemy/migrate_repo/versions/091_convert_volume_ids_to_uuid.py index 00aa95fb8309..3c4183f68ac2 100644 --- a/nova/db/sqlalchemy/migrate_repo/versions/091_convert_volume_ids_to_uuid.py +++ b/nova/db/sqlalchemy/migrate_repo/versions/091_convert_volume_ids_to_uuid.py @@ -17,7 +17,7 @@ from sqlalchemy import MetaData, select, Table -from nova import log as logging +from nova.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/nova/db/sqlalchemy/migrate_repo/versions/092_add_instance_system_metadata.py b/nova/db/sqlalchemy/migrate_repo/versions/092_add_instance_system_metadata.py index 2d0e7a0ddd0d..130c4fe59e22 100644 --- a/nova/db/sqlalchemy/migrate_repo/versions/092_add_instance_system_metadata.py +++ b/nova/db/sqlalchemy/migrate_repo/versions/092_add_instance_system_metadata.py @@ -18,7 +18,7 @@ from sqlalchemy import Boolean, Column, DateTime, ForeignKey, Integer from sqlalchemy import MetaData, String, Table -from nova import log as logging +from nova.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/nova/db/sqlalchemy/migrate_repo/versions/095_change_fk_instance_id_to_uuid.py b/nova/db/sqlalchemy/migrate_repo/versions/095_change_fk_instance_id_to_uuid.py index b561c85c421f..08501177dfd2 100644 --- a/nova/db/sqlalchemy/migrate_repo/versions/095_change_fk_instance_id_to_uuid.py +++ b/nova/db/sqlalchemy/migrate_repo/versions/095_change_fk_instance_id_to_uuid.py @@ -20,7 +20,7 @@ from migrate import ForeignKeyConstraint from sqlalchemy import MetaData, Integer, String, Table from sqlalchemy import select, Column -from nova import log as logging +from nova.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/nova/db/sqlalchemy/migrate_repo/versions/097_quota_usages_reservations.py b/nova/db/sqlalchemy/migrate_repo/versions/097_quota_usages_reservations.py index f56cc71b95f9..82d66938c56a 100644 --- a/nova/db/sqlalchemy/migrate_repo/versions/097_quota_usages_reservations.py +++ b/nova/db/sqlalchemy/migrate_repo/versions/097_quota_usages_reservations.py @@ -15,7 +15,7 @@ from sqlalchemy import Boolean, Column, DateTime from sqlalchemy import MetaData, Integer, String, Table, ForeignKey -from nova import log as logging +from nova.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/nova/db/sqlalchemy/migrate_repo/versions/099_add_disabled_instance_types.py b/nova/db/sqlalchemy/migrate_repo/versions/099_add_disabled_instance_types.py index 166ca98cbbf9..549426608dd4 100644 --- a/nova/db/sqlalchemy/migrate_repo/versions/099_add_disabled_instance_types.py +++ b/nova/db/sqlalchemy/migrate_repo/versions/099_add_disabled_instance_types.py @@ -14,7 +14,7 @@ from sqlalchemy import Boolean, Column, MetaData, Table -from nova import log as logging +from nova.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/nova/db/sqlalchemy/migrate_repo/versions/100_instance_metadata_uses_uuid.py b/nova/db/sqlalchemy/migrate_repo/versions/100_instance_metadata_uses_uuid.py index 4c02ef55717b..e5c2a275d8e5 100644 --- a/nova/db/sqlalchemy/migrate_repo/versions/100_instance_metadata_uses_uuid.py +++ b/nova/db/sqlalchemy/migrate_repo/versions/100_instance_metadata_uses_uuid.py @@ -20,7 +20,7 @@ from migrate import ForeignKeyConstraint from sqlalchemy import MetaData, String, Table from sqlalchemy import select, Column, ForeignKey, Integer -from nova import log as logging +from nova.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/nova/db/sqlalchemy/migrate_repo/versions/101_security_group_instance_association_uses_uuid.py b/nova/db/sqlalchemy/migrate_repo/versions/101_security_group_instance_association_uses_uuid.py index 42aba6b7b55e..26b53bb7e9a3 100644 --- a/nova/db/sqlalchemy/migrate_repo/versions/101_security_group_instance_association_uses_uuid.py +++ b/nova/db/sqlalchemy/migrate_repo/versions/101_security_group_instance_association_uses_uuid.py @@ -20,7 +20,7 @@ from migrate import ForeignKeyConstraint from sqlalchemy import MetaData, String, Table from sqlalchemy import select, Column, ForeignKey, Integer -from nova import log as logging +from nova.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/nova/db/sqlalchemy/migrate_repo/versions/102_consoles_uses_uuid.py b/nova/db/sqlalchemy/migrate_repo/versions/102_consoles_uses_uuid.py index 7484b73c6f81..1cfa523c6b70 100644 --- a/nova/db/sqlalchemy/migrate_repo/versions/102_consoles_uses_uuid.py +++ b/nova/db/sqlalchemy/migrate_repo/versions/102_consoles_uses_uuid.py @@ -20,7 +20,7 @@ from migrate import ForeignKeyConstraint from sqlalchemy import MetaData, String, Table from sqlalchemy import select, Column, ForeignKey, Integer -from nova import log as logging +from nova.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/nova/db/sqlalchemy/migrate_repo/versions/105_instance_info_caches_uses_uuid.py b/nova/db/sqlalchemy/migrate_repo/versions/105_instance_info_caches_uses_uuid.py index f98f399c8303..c1c7d7a44ad4 100644 --- a/nova/db/sqlalchemy/migrate_repo/versions/105_instance_info_caches_uses_uuid.py +++ b/nova/db/sqlalchemy/migrate_repo/versions/105_instance_info_caches_uses_uuid.py @@ -20,7 +20,7 @@ from sqlalchemy import select, Column, ForeignKey, Integer from sqlalchemy import MetaData, String, Table from migrate import ForeignKeyConstraint -from nova import log as logging +from nova.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/nova/db/sqlalchemy/migrate_repo/versions/106_add_foreign_keys.py b/nova/db/sqlalchemy/migrate_repo/versions/106_add_foreign_keys.py index 1aed8588efc5..8d867609c548 100644 --- a/nova/db/sqlalchemy/migrate_repo/versions/106_add_foreign_keys.py +++ b/nova/db/sqlalchemy/migrate_repo/versions/106_add_foreign_keys.py @@ -20,7 +20,7 @@ from sqlalchemy import select, Column, ForeignKey, Integer from sqlalchemy import MetaData, String, Table from migrate import ForeignKeyConstraint -from nova import log as logging +from nova.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/nova/db/sqlalchemy/migrate_repo/versions/107_add_instance_id_mappings.py b/nova/db/sqlalchemy/migrate_repo/versions/107_add_instance_id_mappings.py index 94adbd89bf45..39985a1af5ca 100644 --- a/nova/db/sqlalchemy/migrate_repo/versions/107_add_instance_id_mappings.py +++ b/nova/db/sqlalchemy/migrate_repo/versions/107_add_instance_id_mappings.py @@ -14,9 +14,9 @@ # License for the specific language governing permissions and limitations # under the License. +from nova.openstack.common import log as logging from sqlalchemy import Boolean, Column, DateTime, Integer from sqlalchemy import Index, MetaData, String, Table -from nova import log as logging LOG = logging.getLogger(__name__) diff --git a/nova/db/sqlalchemy/migration.py b/nova/db/sqlalchemy/migration.py index e7c659a70840..69375d05c9e3 100644 --- a/nova/db/sqlalchemy/migration.py +++ b/nova/db/sqlalchemy/migration.py @@ -23,7 +23,7 @@ from nova.db import migration from nova.db.sqlalchemy.session import get_engine from nova import exception from nova import flags -from nova import log as logging +from nova.openstack.common import log as logging import migrate diff --git a/nova/db/sqlalchemy/session.py b/nova/db/sqlalchemy/session.py index 4f115e16c197..a161c0327093 100644 --- a/nova/db/sqlalchemy/session.py +++ b/nova/db/sqlalchemy/session.py @@ -27,7 +27,7 @@ from sqlalchemy.pool import NullPool, StaticPool import nova.exception import nova.flags as flags -import nova.log as logging +import nova.openstack.common.log as logging FLAGS = flags.FLAGS diff --git a/nova/exception.py b/nova/exception.py index df21f02730af..c1f417afe292 100644 --- a/nova/exception.py +++ b/nova/exception.py @@ -29,8 +29,8 @@ import itertools import webob.exc -from nova import log as logging from nova.openstack.common import excutils +from nova.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/nova/flags.py b/nova/flags.py index bb769c4dd120..cff3b46ae57c 100644 --- a/nova/flags.py +++ b/nova/flags.py @@ -73,18 +73,6 @@ def _get_my_ip(): return "127.0.0.1" -log_opts = [ - cfg.StrOpt('logdir', - default=None, - help='Log output to a per-service log file in named directory'), - cfg.StrOpt('logfile', - default=None, - help='Log output to a named file'), - cfg.BoolOpt('use_stderr', - default=True, - help='Log output to standard error'), - ] - core_opts = [ cfg.StrOpt('connection_type', default=None, @@ -125,7 +113,6 @@ debug_opts = [ help='Add python stack traces to SQL as comment strings'), ] -FLAGS.register_cli_opts(log_opts) FLAGS.register_cli_opts(core_opts) FLAGS.register_cli_opts(debug_opts) @@ -273,9 +260,6 @@ global_opts = [ cfg.IntOpt('auth_token_ttl', default=3600, help='Seconds for auth tokens to linger'), - cfg.StrOpt('logfile_mode', - default='0644', - help='Default file mode used when creating log files'), cfg.StrOpt('sqlite_db', default='nova.sqlite', help='the filename to use with sqlite'), diff --git a/nova/image/glance.py b/nova/image/glance.py index d8c2e1245776..2da91c9b6bc9 100644 --- a/nova/image/glance.py +++ b/nova/image/glance.py @@ -30,8 +30,8 @@ from glance.common import exception as glance_exception from nova import exception from nova import flags -from nova import log as logging from nova.openstack.common import jsonutils +from nova.openstack.common import log as logging from nova.openstack.common import timeutils from nova import utils diff --git a/nova/image/s3.py b/nova/image/s3.py index df2758b3a230..282f7702a090 100644 --- a/nova/image/s3.py +++ b/nova/image/s3.py @@ -34,8 +34,8 @@ import nova.cert.rpcapi from nova import exception from nova import flags from nova.image import glance -from nova import log as logging from nova.openstack.common import cfg +from nova.openstack.common import log as logging from nova import utils diff --git a/nova/manager.py b/nova/manager.py index 1d73040b4c2f..a74caa8f6290 100644 --- a/nova/manager.py +++ b/nova/manager.py @@ -55,7 +55,7 @@ This module provides Manager, a base class for managers. from nova.db import base from nova import flags -from nova import log as logging +from nova.openstack.common import log as logging from nova.openstack.common.rpc import dispatcher as rpc_dispatcher from nova.scheduler import rpcapi as scheduler_rpcapi from nova import version diff --git a/nova/network/api.py b/nova/network/api.py index a36edd79698d..6a5c151da830 100644 --- a/nova/network/api.py +++ b/nova/network/api.py @@ -22,8 +22,8 @@ import inspect from nova.db import base from nova import flags -from nova import log as logging from nova.network import model as network_model +from nova.openstack.common import log as logging from nova.openstack.common import rpc diff --git a/nova/network/l3.py b/nova/network/l3.py index 034678aa5cf4..e098c1e8f1bc 100644 --- a/nova/network/l3.py +++ b/nova/network/l3.py @@ -16,8 +16,8 @@ # under the License. from nova import flags -from nova import log as logging from nova.network import linux_net +from nova.openstack.common import log as logging from nova import utils LOG = logging.getLogger(__name__) diff --git a/nova/network/ldapdns.py b/nova/network/ldapdns.py index 25e6e55ade66..e3ba3006c6cc 100644 --- a/nova/network/ldapdns.py +++ b/nova/network/ldapdns.py @@ -18,8 +18,8 @@ import time from nova.auth import fakeldap from nova import exception from nova import flags -from nova import log as logging from nova.openstack.common import cfg +from nova.openstack.common import log as logging from nova import utils diff --git a/nova/network/linux_net.py b/nova/network/linux_net.py index 828174b3a774..d5c6bb45990c 100644 --- a/nova/network/linux_net.py +++ b/nova/network/linux_net.py @@ -27,9 +27,9 @@ import os from nova import db from nova import exception from nova import flags -from nova import log as logging from nova.openstack.common import cfg from nova.openstack.common import importutils +from nova.openstack.common import log as logging from nova import utils diff --git a/nova/network/manager.py b/nova/network/manager.py index 114e0d750b41..d4937d90bcca 100644 --- a/nova/network/manager.py +++ b/nova/network/manager.py @@ -58,7 +58,6 @@ from nova import context from nova import exception from nova import flags from nova import ipv6 -from nova import log as logging from nova import manager from nova.network import api as network_api from nova.network import model as network_model @@ -67,6 +66,7 @@ from nova.openstack.common import cfg from nova.openstack.common import excutils from nova.openstack.common import importutils from nova.openstack.common import jsonutils +from nova.openstack.common import log as logging from nova.openstack.common import rpc from nova.openstack.common import timeutils import nova.policy diff --git a/nova/network/quantum/manager.py b/nova/network/quantum/manager.py index 95ee06c9f09f..9fa852c09208 100644 --- a/nova/network/quantum/manager.py +++ b/nova/network/quantum/manager.py @@ -23,11 +23,11 @@ from nova import context from nova import db from nova import exception from nova import flags -from nova import log as logging from nova.network import manager from nova.network.quantum import melange_ipam_lib from nova.network.quantum import quantum_connection from nova.openstack.common import cfg +from nova.openstack.common import log as logging from nova.openstack.common import rpc from nova import utils diff --git a/nova/network/quantum/melange_connection.py b/nova/network/quantum/melange_connection.py index dd16afc71445..34222290964d 100644 --- a/nova/network/quantum/melange_connection.py +++ b/nova/network/quantum/melange_connection.py @@ -22,9 +22,9 @@ import urllib from nova import exception from nova import flags -from nova import log as logging from nova.openstack.common import cfg from nova.openstack.common import jsonutils +from nova.openstack.common import log as logging melange_opts = [ diff --git a/nova/network/quantum/melange_ipam_lib.py b/nova/network/quantum/melange_ipam_lib.py index 6ceabc8a498a..44f4b3c69c17 100644 --- a/nova/network/quantum/melange_ipam_lib.py +++ b/nova/network/quantum/melange_ipam_lib.py @@ -20,8 +20,8 @@ import netaddr from nova import db from nova import exception from nova import flags -from nova import log as logging from nova.network.quantum import melange_connection +from nova.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/nova/network/quantum/nova_ipam_lib.py b/nova/network/quantum/nova_ipam_lib.py index ceb58956281f..08e19f0a40f8 100644 --- a/nova/network/quantum/nova_ipam_lib.py +++ b/nova/network/quantum/nova_ipam_lib.py @@ -21,8 +21,8 @@ from nova import db from nova import exception from nova import flags from nova import ipv6 -from nova import log as logging from nova.network import manager +from nova.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/nova/network/quantum/quantum_connection.py b/nova/network/quantum/quantum_connection.py index 52a9fc301d9b..2161c7916369 100644 --- a/nova/network/quantum/quantum_connection.py +++ b/nova/network/quantum/quantum_connection.py @@ -16,9 +16,9 @@ # under the License. from nova import flags -from nova import log as logging from nova.network.quantum import client as quantum_client from nova.openstack.common import cfg +from nova.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/nova/network/quantum/sg.py b/nova/network/quantum/sg.py index 7212280c53e0..7f41a99836a7 100644 --- a/nova/network/quantum/sg.py +++ b/nova/network/quantum/sg.py @@ -27,7 +27,7 @@ will provide enhanced functionality and will be loadable via the security_group_handler flag. ''' -from nova import log as logging +from nova.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/nova/notifications.py b/nova/notifications.py index 29bca2c2fbed..998abee65430 100644 --- a/nova/notifications.py +++ b/nova/notifications.py @@ -23,11 +23,11 @@ import nova.context from nova import db from nova import exception from nova import flags -from nova import log from nova import network from nova.network import model as network_model from nova.notifier import api as notifier_api from nova.openstack.common import cfg +from nova.openstack.common import log from nova.openstack.common import timeutils from nova import utils diff --git a/nova/notifier/api.py b/nova/notifier/api.py index cf96dfed4e78..df3b39a68178 100644 --- a/nova/notifier/api.py +++ b/nova/notifier/api.py @@ -17,10 +17,10 @@ import uuid from nova import exception from nova import flags -from nova import log as logging from nova.openstack.common import cfg from nova.openstack.common import importutils from nova.openstack.common import jsonutils +from nova.openstack.common import log as logging from nova.openstack.common import timeutils diff --git a/nova/notifier/capacity_notifier.py b/nova/notifier/capacity_notifier.py index b8e3a88e288c..ea78382d83ff 100644 --- a/nova/notifier/capacity_notifier.py +++ b/nova/notifier/capacity_notifier.py @@ -15,7 +15,7 @@ from nova import context from nova import db -from nova import log as logging +from nova.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/nova/notifier/list_notifier.py b/nova/notifier/list_notifier.py index 4e73bdd50802..5aa7738b205b 100644 --- a/nova/notifier/list_notifier.py +++ b/nova/notifier/list_notifier.py @@ -14,9 +14,9 @@ # under the License. from nova import flags -from nova import log as logging from nova.openstack.common import cfg from nova.openstack.common import importutils +from nova.openstack.common import log as logging list_notifier_drivers_opt = cfg.MultiStrOpt('list_notifier_drivers', diff --git a/nova/notifier/log_notifier.py b/nova/notifier/log_notifier.py index 50528d3e6862..5ce6dc4af183 100644 --- a/nova/notifier/log_notifier.py +++ b/nova/notifier/log_notifier.py @@ -14,8 +14,8 @@ # under the License. from nova import flags -from nova import log as logging from nova.openstack.common import jsonutils +from nova.openstack.common import log as logging FLAGS = flags.FLAGS diff --git a/nova/notifier/rabbit_notifier.py b/nova/notifier/rabbit_notifier.py index 27f6ea209b2d..867ad9c19b5f 100644 --- a/nova/notifier/rabbit_notifier.py +++ b/nova/notifier/rabbit_notifier.py @@ -17,8 +17,8 @@ import nova.context from nova import flags -from nova import log as logging from nova.openstack.common import cfg +from nova.openstack.common import log as logging from nova.openstack.common import rpc LOG = logging.getLogger(__name__) diff --git a/nova/log.py b/nova/openstack/common/log.py similarity index 76% rename from nova/log.py rename to nova/openstack/common/log.py index 19ad95b70777..42491b717b4e 100644 --- a/nova/log.py +++ b/nova/openstack/common/log.py @@ -17,7 +17,7 @@ # License for the specific language governing permissions and limitations # under the License. -"""Nova logging handler. +"""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 @@ -25,7 +25,7 @@ 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 flags. +It also allows setting of formatting information through conf. """ @@ -40,12 +40,10 @@ import stat import sys import traceback -import nova -from nova import flags +from nova import notifier from nova.openstack.common import cfg from nova.openstack.common import jsonutils from nova.openstack.common import local -from nova import version log_opts = [ @@ -92,8 +90,26 @@ log_opts = [ 'format it like this'), ] -FLAGS = flags.FLAGS -FLAGS.register_opts(log_opts) + +generic_log_opts = [ + cfg.StrOpt('logdir', + default=None, + help='Log output to a per-service log file in named directory'), + cfg.StrOpt('logfile', + default=None, + help='Log output to a named file'), + cfg.BoolOpt('use_stderr', + default=True, + help='Log output to standard error'), + cfg.StrOpt('logfile_mode', + default='0644', + help='Default file mode used when creating log files'), + ] + + +CONF = cfg.CONF +CONF.register_opts(generic_log_opts) +CONF.register_opts(log_opts) # our new audit level # NOTE(jkoelker) Since we synthesized an audit level, make the logging @@ -129,8 +145,8 @@ def _get_binary_name(): def _get_log_file_path(binary=None): - logfile = FLAGS.log_file or FLAGS.logfile - logdir = FLAGS.log_dir or FLAGS.logdir + logfile = CONF.log_file or CONF.logfile + logdir = CONF.log_dir or CONF.logdir if logfile and not logdir: return logfile @@ -143,11 +159,13 @@ def _get_log_file_path(binary=None): return '%s.log' % (os.path.join(logdir, binary),) -class NovaContextAdapter(logging.LoggerAdapter): +class ContextAdapter(logging.LoggerAdapter): warn = logging.LoggerAdapter.warning - def __init__(self, logger): + def __init__(self, logger, project_name, version_string): self.logger = logger + self.project = project_name + self.version = version_string def audit(self, msg, *args, **kwargs): self.log(logging.AUDIT, msg, *args, **kwargs) @@ -166,15 +184,16 @@ class NovaContextAdapter(logging.LoggerAdapter): instance = kwargs.pop('instance', None) instance_extra = '' if instance: - instance_extra = FLAGS.instance_format % instance + instance_extra = CONF.instance_format % instance else: instance_uuid = kwargs.pop('instance_uuid', None) if instance_uuid: - instance_extra = (FLAGS.instance_uuid_format + instance_extra = (CONF.instance_uuid_format % {'uuid': instance_uuid}) extra.update({'instance': instance_extra}) - extra.update({"nova_version": version.version_string_with_vcs()}) + extra.update({"project": self.project}) + extra.update({"version": self.version}) extra['extra'] = extra.copy() return msg, kwargs @@ -225,8 +244,153 @@ class JSONFormatter(logging.Formatter): return jsonutils.dumps(message) -class LegacyNovaFormatter(logging.Formatter): - """A nova.context.RequestContext aware formatter configured through flags. +class PublishErrorsHandler(logging.Handler): + def emit(self, record): + if 'list_notifier_drivers' in CONF: + if ('nova.openstack.common.notifier.log_notifier' in + CONF.list_notifier_drivers): + return + notifier.api.notify(None, 'error.publisher', + 'error_notification', + notifier.api.ERROR, + dict(error=record.msg)) + + +def handle_exception(type, value, tb): + extra = {} + if CONF.verbose: + extra['exc_info'] = (type, value, tb) + getLogger().critical(str(value), **extra) + + +def setup(product_name): + """Setup logging.""" + sys.excepthook = handle_exception + + if CONF.log_config: + try: + logging.config.fileConfig(CONF.log_config) + except Exception: + traceback.print_exc() + raise + else: + _setup_logging_from_conf(product_name) + + +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 + + +def _setup_logging_from_conf(product_name): + log_root = getLogger(product_name).logger + for handler in log_root.handlers: + log_root.removeHandler(handler) + + if CONF.use_syslog: + facility = _find_facility_from_conf() + syslog = logging.handlers.SysLogHandler(address='/dev/log', + facility=facility) + log_root.addHandler(syslog) + + logpath = _get_log_file_path() + if logpath: + filelog = logging.handlers.WatchedFileHandler(logpath) + log_root.addHandler(filelog) + + mode = int(CONF.logfile_mode, 8) + st = os.stat(logpath) + if st.st_mode != (stat.S_IFREG | mode): + os.chmod(logpath, mode) + + if CONF.use_stderr: + streamlog = ColorHandler() + log_root.addHandler(streamlog) + + elif not CONF.log_file: + # 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: + log_root.addHandler(PublishErrorsHandler(logging.ERROR)) + + for handler in log_root.handlers: + datefmt = CONF.log_date_format + if CONF.log_format: + handler.setFormatter(logging.Formatter(fmt=CONF.log_format, + datefmt=datefmt)) + handler.setFormatter(LegacyFormatter(datefmt=datefmt)) + + if CONF.verbose or CONF.debug: + log_root.setLevel(logging.DEBUG) + else: + log_root.setLevel(logging.INFO) + + level = logging.NOTSET + for pair in CONF.default_log_levels: + mod, _sep, level_name = pair.partition('=') + level = logging.getLevelName(level_name) + logger = logging.getLogger(mod) + logger.setLevel(level) + for handler in log_root.handlers: + logger.addHandler(handler) + + # NOTE(jkoelker) Clear the handlers for the root logger that was setup + # by basicConfig in nova/__init__.py and install the + # NullHandler. + root = logging.getLogger() + for handler in root.handlers: + root.removeHandler(handler) + handler = NullHandler() + handler.setFormatter(logging.Formatter()) + root.addHandler(handler) + + +_loggers = {} + + +def getLogger(name='unknown', version='unknown'): + if name not in _loggers: + _loggers[name] = ContextAdapter(logging.getLogger(name), + name, + version) + return _loggers[name] + + +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) + + +class LegacyFormatter(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 @@ -244,13 +408,13 @@ class LegacyNovaFormatter(logging.Formatter): record.__dict__['instance'] = '' if record.__dict__.get('request_id', None): - self._fmt = FLAGS.logging_context_format_string + self._fmt = CONF.logging_context_format_string else: - self._fmt = FLAGS.logging_default_format_string + self._fmt = CONF.logging_default_format_string if (record.levelno == logging.DEBUG and - FLAGS.logging_debug_format_suffix): - self._fmt += " " + FLAGS.logging_debug_format_suffix + CONF.logging_debug_format_suffix): + self._fmt += " " + CONF.logging_debug_format_suffix # Cache this on the record, Logger will respect our formated copy if record.exc_info: @@ -258,7 +422,7 @@ class LegacyNovaFormatter(logging.Formatter): return logging.Formatter.format(self, record) def formatException(self, exc_info, record=None): - """Format exception output with FLAGS.logging_exception_prefix.""" + """Format exception output with CONF.logging_exception_prefix.""" if not record: return logging.Formatter.formatException(self, exc_info) @@ -268,18 +432,18 @@ class LegacyNovaFormatter(logging.Formatter): lines = stringbuffer.getvalue().split('\n') stringbuffer.close() - if FLAGS.logging_exception_prefix.find('%(asctime)') != -1: + if CONF.logging_exception_prefix.find('%(asctime)') != -1: record.asctime = self.formatTime(record, self.datefmt) formatted_lines = [] for line in lines: - pl = FLAGS.logging_exception_prefix % record.__dict__ + pl = CONF.logging_exception_prefix % record.__dict__ fl = '%s%s' % (pl, line) formatted_lines.append(fl) return '\n'.join(formatted_lines) -class NovaColorHandler(logging.StreamHandler): +class ColorHandler(logging.StreamHandler): LEVEL_COLORS = { logging.DEBUG: '\033[00;32m', # GREEN logging.INFO: '\033[00;36m', # CYAN @@ -292,145 +456,3 @@ class NovaColorHandler(logging.StreamHandler): def format(self, record): record.color = self.LEVEL_COLORS[record.levelno] return logging.StreamHandler.format(self, record) - - -class PublishErrorsHandler(logging.Handler): - def emit(self, record): - if 'list_notifier_drivers' in FLAGS: - if 'nova.notifier.log_notifier' in FLAGS.list_notifier_drivers: - return - nova.notifier.api.notify(None, 'nova.error.publisher', - 'error_notification', - nova.notifier.api.ERROR, - dict(error=record.msg)) - - -def handle_exception(type, value, tb): - extra = {} - if FLAGS.verbose: - extra['exc_info'] = (type, value, tb) - getLogger().critical(str(value), **extra) - - -def setup(): - """Setup nova logging.""" - sys.excepthook = handle_exception - - if FLAGS.log_config: - try: - logging.config.fileConfig(FLAGS.log_config) - except Exception: - traceback.print_exc() - raise - else: - _setup_logging_from_flags() - - -def _find_facility_from_flags(): - facility_names = logging.handlers.SysLogHandler.facility_names - facility = getattr(logging.handlers.SysLogHandler, - FLAGS.syslog_log_facility, - None) - - if facility is None and FLAGS.syslog_log_facility in facility_names: - facility = facility_names.get(FLAGS.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 - - -def _setup_logging_from_flags(): - nova_root = getLogger().logger - for handler in nova_root.handlers: - nova_root.removeHandler(handler) - - if FLAGS.use_syslog: - facility = _find_facility_from_flags() - syslog = logging.handlers.SysLogHandler(address='/dev/log', - facility=facility) - nova_root.addHandler(syslog) - - logpath = _get_log_file_path() - if logpath: - filelog = logging.handlers.WatchedFileHandler(logpath) - nova_root.addHandler(filelog) - - mode = int(FLAGS.logfile_mode, 8) - st = os.stat(logpath) - if st.st_mode != (stat.S_IFREG | mode): - os.chmod(logpath, mode) - - if FLAGS.use_stderr: - streamlog = NovaColorHandler() - nova_root.addHandler(streamlog) - - elif not FLAGS.log_file: - # pass sys.stdout as a positional argument - # python2.6 calls the argument strm, in 2.7 it's stream - streamlog = logging.StreamHandler(sys.stdout) - nova_root.addHandler(streamlog) - - if FLAGS.publish_errors: - nova_root.addHandler(PublishErrorsHandler(logging.ERROR)) - - for handler in nova_root.handlers: - datefmt = FLAGS.log_date_format - if FLAGS.log_format: - handler.setFormatter(logging.Formatter(fmt=FLAGS.log_format, - datefmt=datefmt)) - handler.setFormatter(LegacyNovaFormatter(datefmt=datefmt)) - - if FLAGS.verbose or FLAGS.debug: - nova_root.setLevel(logging.DEBUG) - else: - nova_root.setLevel(logging.INFO) - - level = logging.NOTSET - for pair in FLAGS.default_log_levels: - mod, _sep, level_name = pair.partition('=') - level = logging.getLevelName(level_name) - logger = logging.getLogger(mod) - logger.setLevel(level) - for handler in nova_root.handlers: - logger.addHandler(handler) - - # NOTE(jkoelker) Clear the handlers for the root logger that was setup - # by basicConfig in nova/__init__.py and install the - # NullHandler. - root = logging.getLogger() - for handler in root.handlers: - root.removeHandler(handler) - handler = NullHandler() - handler.setFormatter(logging.Formatter()) - root.addHandler(handler) - - -_loggers = {} - - -def getLogger(name='nova'): - if name not in _loggers: - _loggers[name] = NovaContextAdapter(logging.getLogger(name)) - return _loggers[name] - - -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) diff --git a/nova/openstack/common/rpc/impl_zmq.py b/nova/openstack/common/rpc/impl_zmq.py index 8435cd020649..dc54913819a0 100644 --- a/nova/openstack/common/rpc/impl_zmq.py +++ b/nova/openstack/common/rpc/impl_zmq.py @@ -47,8 +47,8 @@ zmq_opts = [ # The module.Class to use for matchmaking. cfg.StrOpt('rpc_zmq_matchmaker', - default='openstack.common.rpc.matchmaker.MatchMakerLocalhost', - help='MatchMaker driver'), + default='nova.openstack.common.rpc.matchmaker.MatchMakerLocalhost', + help='MatchMaker driver'), # The following port is unassigned by IANA as of 2012-05-21 cfg.IntOpt('rpc_zmq_port', default=9501, diff --git a/nova/quota.py b/nova/quota.py index 68321cf74165..d3ba0aa0209a 100644 --- a/nova/quota.py +++ b/nova/quota.py @@ -23,9 +23,9 @@ import datetime from nova import db from nova import exception from nova import flags -from nova import log as logging from nova.openstack.common import cfg from nova.openstack.common import importutils +from nova.openstack.common import log as logging from nova.openstack.common import timeutils diff --git a/nova/scheduler/driver.py b/nova/scheduler/driver.py index 64f068ff28a9..be39d5a0a190 100644 --- a/nova/scheduler/driver.py +++ b/nova/scheduler/driver.py @@ -28,11 +28,11 @@ from nova.compute import task_states from nova import db from nova import exception from nova import flags -from nova import log as logging from nova import notifications from nova.openstack.common import cfg from nova.openstack.common import importutils from nova.openstack.common import jsonutils +from nova.openstack.common import log as logging from nova.openstack.common import rpc from nova.openstack.common import timeutils from nova import utils diff --git a/nova/scheduler/filter_scheduler.py b/nova/scheduler/filter_scheduler.py index c577e35696fc..c186ceeb40f8 100644 --- a/nova/scheduler/filter_scheduler.py +++ b/nova/scheduler/filter_scheduler.py @@ -23,9 +23,9 @@ import operator from nova import exception from nova import flags -from nova import log as logging from nova.notifier import api as notifier from nova.openstack.common import importutils +from nova.openstack.common import log as logging from nova.scheduler import driver from nova.scheduler import least_cost from nova.scheduler import scheduler_options diff --git a/nova/scheduler/filters/arch_filter.py b/nova/scheduler/filters/arch_filter.py index 1f11d07b6825..625ce2909804 100644 --- a/nova/scheduler/filters/arch_filter.py +++ b/nova/scheduler/filters/arch_filter.py @@ -15,7 +15,7 @@ # under the License. -from nova import log as logging +from nova.openstack.common import log as logging from nova.scheduler import filters from nova import utils diff --git a/nova/scheduler/filters/compute_filter.py b/nova/scheduler/filters/compute_filter.py index 5409d3db0ae7..5ba078394e39 100644 --- a/nova/scheduler/filters/compute_filter.py +++ b/nova/scheduler/filters/compute_filter.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from nova import log as logging +from nova.openstack.common import log as logging from nova.scheduler import filters from nova import utils diff --git a/nova/scheduler/filters/core_filter.py b/nova/scheduler/filters/core_filter.py index 5abcfeec731c..5af68bc9fac8 100644 --- a/nova/scheduler/filters/core_filter.py +++ b/nova/scheduler/filters/core_filter.py @@ -16,8 +16,8 @@ # under the License. from nova import flags -from nova import log as logging from nova.openstack.common import cfg +from nova.openstack.common import log as logging from nova.scheduler import filters diff --git a/nova/scheduler/filters/ram_filter.py b/nova/scheduler/filters/ram_filter.py index 4bc84c243d29..7f79c1923efd 100644 --- a/nova/scheduler/filters/ram_filter.py +++ b/nova/scheduler/filters/ram_filter.py @@ -15,8 +15,8 @@ # under the License. from nova import flags -from nova import log as logging from nova.openstack.common import cfg +from nova.openstack.common import log as logging from nova.scheduler import filters LOG = logging.getLogger(__name__) diff --git a/nova/scheduler/filters/trusted_filter.py b/nova/scheduler/filters/trusted_filter.py index 41dc18dc3044..a7c711b4ec6d 100644 --- a/nova/scheduler/filters/trusted_filter.py +++ b/nova/scheduler/filters/trusted_filter.py @@ -49,9 +49,9 @@ import socket import ssl from nova import flags -from nova import log as logging from nova.openstack.common import cfg from nova.openstack.common import jsonutils +from nova.openstack.common import log as logging from nova.scheduler import filters diff --git a/nova/scheduler/host_manager.py b/nova/scheduler/host_manager.py index 6de5ebc8f04c..19f0a0bb7848 100644 --- a/nova/scheduler/host_manager.py +++ b/nova/scheduler/host_manager.py @@ -23,8 +23,8 @@ import UserDict from nova import db from nova import exception from nova import flags -from nova import log as logging from nova.openstack.common import cfg +from nova.openstack.common import log as logging from nova.openstack.common import timeutils from nova.scheduler import filters diff --git a/nova/scheduler/least_cost.py b/nova/scheduler/least_cost.py index 45b76bb479e9..71db730cbb80 100644 --- a/nova/scheduler/least_cost.py +++ b/nova/scheduler/least_cost.py @@ -23,8 +23,8 @@ is then selected for provisioning. """ from nova import flags -from nova import log as logging from nova.openstack.common import cfg +from nova.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/nova/scheduler/manager.py b/nova/scheduler/manager.py index e24705a0204f..436df0946adf 100644 --- a/nova/scheduler/manager.py +++ b/nova/scheduler/manager.py @@ -27,13 +27,13 @@ from nova.compute import vm_states from nova import db from nova import exception from nova import flags -from nova import log as logging from nova import manager from nova import notifications from nova.notifier import api as notifier from nova.openstack.common import cfg from nova.openstack.common import excutils from nova.openstack.common import importutils +from nova.openstack.common import log as logging from nova import quota diff --git a/nova/scheduler/scheduler_options.py b/nova/scheduler/scheduler_options.py index 94572fc69873..7acf2f750e0b 100644 --- a/nova/scheduler/scheduler_options.py +++ b/nova/scheduler/scheduler_options.py @@ -27,8 +27,8 @@ import json import os from nova import flags -from nova import log as logging from nova.openstack.common import cfg +from nova.openstack.common import log as logging from nova.openstack.common import timeutils diff --git a/nova/service.py b/nova/service.py index d3fb7693381c..bb2964b95287 100644 --- a/nova/service.py +++ b/nova/service.py @@ -35,9 +35,9 @@ from nova import context from nova import db from nova import exception from nova import flags -from nova import log as logging from nova.openstack.common import cfg from nova.openstack.common import importutils +from nova.openstack.common import log as logging from nova.openstack.common import rpc from nova import utils from nova import version diff --git a/nova/test.py b/nova/test.py index da115300eb93..a8a2464cebf2 100644 --- a/nova/test.py +++ b/nova/test.py @@ -32,8 +32,8 @@ import nose.plugins.skip import stubout from nova import flags -from nova import log as logging from nova.openstack.common import cfg +from nova.openstack.common import log as logging from nova.openstack.common import timeutils from nova import service from nova import tests diff --git a/nova/tests/__init__.py b/nova/tests/__init__.py index 9ff38e3a97d7..a8d0ef28c822 100644 --- a/nova/tests/__init__.py +++ b/nova/tests/__init__.py @@ -39,7 +39,7 @@ import shutil from nova.db.sqlalchemy.session import get_engine from nova import flags -from nova import log as logging +from nova.openstack.common import log as logging import eventlet @@ -49,7 +49,7 @@ eventlet.monkey_patch(os=False) FLAGS = flags.FLAGS FLAGS.use_stderr = False -logging.setup() +logging.setup('nova') _DB = None diff --git a/nova/tests/api/ec2/test_cloud.py b/nova/tests/api/ec2/test_cloud.py index 0603cac62886..6128811f1d52 100644 --- a/nova/tests/api/ec2/test_cloud.py +++ b/nova/tests/api/ec2/test_cloud.py @@ -37,8 +37,8 @@ from nova import db from nova import exception from nova import flags from nova.image import s3 -from nova import log as logging from nova.network import api as network_api +from nova.openstack.common import log as logging from nova.openstack.common import rpc from nova import test from nova.tests.image import fake diff --git a/nova/tests/api/ec2/test_ec2_validate.py b/nova/tests/api/ec2/test_ec2_validate.py index f9c1d2be88f8..18f99ffbb63c 100644 --- a/nova/tests/api/ec2/test_ec2_validate.py +++ b/nova/tests/api/ec2/test_ec2_validate.py @@ -22,8 +22,8 @@ from nova import context from nova import db from nova import exception from nova import flags -from nova import log as logging from nova.openstack.common import importutils +from nova.openstack.common import log as logging from nova.openstack.common import rpc from nova import test from nova.tests.image import fake diff --git a/nova/tests/api/openstack/compute/contrib/test_aggregates.py b/nova/tests/api/openstack/compute/contrib/test_aggregates.py index fc19a9545ebb..c2c5a148650a 100644 --- a/nova/tests/api/openstack/compute/contrib/test_aggregates.py +++ b/nova/tests/api/openstack/compute/contrib/test_aggregates.py @@ -20,7 +20,7 @@ from webob import exc from nova.api.openstack.compute.contrib import aggregates from nova import context from nova import exception -from nova import log as logging +from nova.openstack.common import log as logging from nova import test diff --git a/nova/tests/api/openstack/compute/contrib/test_hosts.py b/nova/tests/api/openstack/compute/contrib/test_hosts.py index 40805bb66ad3..686548726922 100644 --- a/nova/tests/api/openstack/compute/contrib/test_hosts.py +++ b/nova/tests/api/openstack/compute/contrib/test_hosts.py @@ -23,7 +23,7 @@ from nova import context from nova import db from nova import exception from nova import flags -from nova import log as logging +from nova.openstack.common import log as logging from nova import test diff --git a/nova/tests/api/openstack/compute/contrib/test_snapshots.py b/nova/tests/api/openstack/compute/contrib/test_snapshots.py index 365c88ef8d1a..b1d05118d92f 100644 --- a/nova/tests/api/openstack/compute/contrib/test_snapshots.py +++ b/nova/tests/api/openstack/compute/contrib/test_snapshots.py @@ -20,8 +20,8 @@ from nova.api.openstack.compute.contrib import volumes from nova import context from nova import exception from nova import flags -from nova import log as logging from nova.openstack.common import jsonutils +from nova.openstack.common import log as logging from nova.openstack.common import timeutils from nova import test from nova.tests.api.openstack import fakes diff --git a/nova/tests/api/openstack/compute/contrib/test_volume_types.py b/nova/tests/api/openstack/compute/contrib/test_volume_types.py index 3d02547909a4..4ad6297b8af0 100644 --- a/nova/tests/api/openstack/compute/contrib/test_volume_types.py +++ b/nova/tests/api/openstack/compute/contrib/test_volume_types.py @@ -18,7 +18,7 @@ import webob from nova.api.openstack.compute.contrib import volumetypes from nova import exception -from nova import log as logging +from nova.openstack.common import log as logging from nova import test from nova.tests.api.openstack import fakes from nova.volume import volume_types diff --git a/nova/tests/api/openstack/compute/test_urlmap.py b/nova/tests/api/openstack/compute/test_urlmap.py index 780879e3cdbc..c0b20bbebf59 100644 --- a/nova/tests/api/openstack/compute/test_urlmap.py +++ b/nova/tests/api/openstack/compute/test_urlmap.py @@ -15,8 +15,8 @@ import webob -from nova import log as logging from nova.openstack.common import jsonutils +from nova.openstack.common import log as logging from nova import test from nova.tests.api.openstack import fakes import nova.tests.image.fake diff --git a/nova/tests/api/openstack/volume/test_router.py b/nova/tests/api/openstack/volume/test_router.py index 53d96c191a0a..677cddb6a4ff 100644 --- a/nova/tests/api/openstack/volume/test_router.py +++ b/nova/tests/api/openstack/volume/test_router.py @@ -20,7 +20,7 @@ from nova.api.openstack.volume import versions from nova.api.openstack.volume import volumes from nova.api.openstack import wsgi from nova import flags -from nova import log as logging +from nova.openstack.common import log as logging from nova import test from nova.tests.api.openstack import fakes diff --git a/nova/tests/api/openstack/volume/test_snapshots.py b/nova/tests/api/openstack/volume/test_snapshots.py index 35708685a516..ccd3a70b4f62 100644 --- a/nova/tests/api/openstack/volume/test_snapshots.py +++ b/nova/tests/api/openstack/volume/test_snapshots.py @@ -19,7 +19,7 @@ import webob from nova.api.openstack.volume import snapshots from nova import exception from nova import flags -from nova import log as logging +from nova.openstack.common import log as logging from nova.openstack.common import timeutils from nova import test from nova.tests.api.openstack import fakes diff --git a/nova/tests/compute/test_compute.py b/nova/tests/compute/test_compute.py index bf4a20cf308c..bd7db1c37537 100644 --- a/nova/tests/compute/test_compute.py +++ b/nova/tests/compute/test_compute.py @@ -39,9 +39,9 @@ from nova import context from nova import db from nova import exception from nova import flags -from nova import log as logging from nova.notifier import test_notifier from nova.openstack.common import importutils +from nova.openstack.common import log as logging from nova.openstack.common import policy as common_policy from nova.openstack.common import rpc from nova.openstack.common.rpc import common as rpc_common diff --git a/nova/tests/consoleauth/test_consoleauth.py b/nova/tests/consoleauth/test_consoleauth.py index 03cd157da6c3..da50eb83b5cc 100644 --- a/nova/tests/consoleauth/test_consoleauth.py +++ b/nova/tests/consoleauth/test_consoleauth.py @@ -25,7 +25,7 @@ import time from nova.consoleauth import manager from nova import context from nova import flags -from nova import log as logging +from nova.openstack.common import log as logging from nova import test diff --git a/nova/tests/fake_utils.py b/nova/tests/fake_utils.py index e64ff97a129f..08a84e73ffcc 100644 --- a/nova/tests/fake_utils.py +++ b/nova/tests/fake_utils.py @@ -21,7 +21,7 @@ import re from eventlet import greenthread from nova import exception -from nova import log as logging +from nova.openstack.common import log as logging from nova import utils LOG = logging.getLogger(__name__) diff --git a/nova/tests/image/fake.py b/nova/tests/image/fake.py index 99b1a61751f1..66e37e5d5425 100644 --- a/nova/tests/image/fake.py +++ b/nova/tests/image/fake.py @@ -24,7 +24,7 @@ import datetime from nova import exception from nova import flags import nova.image.glance -from nova import log as logging +from nova.openstack.common import log as logging from nova import utils diff --git a/nova/tests/integrated/api/client.py b/nova/tests/integrated/api/client.py index ce0dc0f82d50..36a90883b5de 100644 --- a/nova/tests/integrated/api/client.py +++ b/nova/tests/integrated/api/client.py @@ -18,8 +18,8 @@ import httplib import urllib import urlparse -from nova import log as logging from nova.openstack.common import jsonutils +from nova.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/nova/tests/integrated/integrated_helpers.py b/nova/tests/integrated/integrated_helpers.py index a514de6775e2..8cd37ba6d1bc 100644 --- a/nova/tests/integrated/integrated_helpers.py +++ b/nova/tests/integrated/integrated_helpers.py @@ -22,7 +22,8 @@ Provides common functionality for integrated unit tests import random import string -from nova.log import logging +import nova.image.glance +from nova.openstack.common.log import logging from nova import service from nova import test # For the flags import nova.tests.image.fake diff --git a/nova/tests/integrated/test_extensions.py b/nova/tests/integrated/test_extensions.py index e5b35645cafa..056ff32b7e95 100644 --- a/nova/tests/integrated/test_extensions.py +++ b/nova/tests/integrated/test_extensions.py @@ -16,7 +16,7 @@ # under the License. from nova import flags -from nova.log import logging +from nova.openstack.common.log import logging from nova.tests.integrated import integrated_helpers diff --git a/nova/tests/integrated/test_login.py b/nova/tests/integrated/test_login.py index aa256f8033f4..cecfef31a217 100644 --- a/nova/tests/integrated/test_login.py +++ b/nova/tests/integrated/test_login.py @@ -16,7 +16,7 @@ # under the License. -from nova.log import logging +from nova.openstack.common.log import logging from nova.tests.integrated import integrated_helpers diff --git a/nova/tests/integrated/test_multiprocess_api.py b/nova/tests/integrated/test_multiprocess_api.py index 6fe1479cd850..fbab7eb49ee1 100644 --- a/nova/tests/integrated/test_multiprocess_api.py +++ b/nova/tests/integrated/test_multiprocess_api.py @@ -22,7 +22,7 @@ import time import traceback from nova import flags -from nova.log import logging +from nova.openstack.common.log import logging from nova import service from nova.tests.integrated import integrated_helpers diff --git a/nova/tests/integrated/test_servers.py b/nova/tests/integrated/test_servers.py index dccc879a7b95..49abd0011b88 100644 --- a/nova/tests/integrated/test_servers.py +++ b/nova/tests/integrated/test_servers.py @@ -18,7 +18,7 @@ import time import unittest -from nova.log import logging +from nova.openstack.common.log import logging from nova.tests.integrated.api import client from nova.tests.integrated import integrated_helpers import nova.virt.fake diff --git a/nova/tests/integrated/test_volumes.py b/nova/tests/integrated/test_volumes.py index 24bc43462c3d..fe70c3ce8f6b 100644 --- a/nova/tests/integrated/test_volumes.py +++ b/nova/tests/integrated/test_volumes.py @@ -18,7 +18,7 @@ import time import unittest -from nova.log import logging +from nova.openstack.common.log import logging from nova import service from nova.tests.integrated.api import client from nova.tests.integrated import integrated_helpers diff --git a/nova/tests/integrated/test_xml.py b/nova/tests/integrated/test_xml.py index 58ca4f726b4b..b6bf197d7955 100644 --- a/nova/tests/integrated/test_xml.py +++ b/nova/tests/integrated/test_xml.py @@ -19,7 +19,7 @@ from lxml import etree from nova.api.openstack import common from nova.api.openstack import xmlutil -from nova.log import logging +from nova.openstack.common.log import logging from nova.tests.integrated import integrated_helpers diff --git a/nova/tests/network/test_linux_net.py b/nova/tests/network/test_linux_net.py index 0660bb0f3c60..b05127c72837 100644 --- a/nova/tests/network/test_linux_net.py +++ b/nova/tests/network/test_linux_net.py @@ -22,9 +22,9 @@ import mox from nova import context from nova import db from nova import flags -from nova import log as logging from nova.network import linux_net from nova.openstack.common import importutils +from nova.openstack.common import log as logging from nova import test from nova import utils diff --git a/nova/tests/network/test_manager.py b/nova/tests/network/test_manager.py index 995c780613dc..276681cad15c 100644 --- a/nova/tests/network/test_manager.py +++ b/nova/tests/network/test_manager.py @@ -23,10 +23,10 @@ import tempfile from nova import context from nova import db from nova import exception -from nova import log as logging from nova.network import linux_net from nova.network import manager as network_manager from nova.openstack.common import importutils +from nova.openstack.common import log as logging from nova.openstack.common import rpc import nova.policy from nova import test diff --git a/nova/tests/network/test_network_info.py b/nova/tests/network/test_network_info.py index f1c908b2cf4e..c9b17306da6b 100644 --- a/nova/tests/network/test_network_info.py +++ b/nova/tests/network/test_network_info.py @@ -16,8 +16,8 @@ # under the License. from nova import exception -from nova import log as logging from nova.network import model +from nova.openstack.common import log as logging from nova import test from nova.tests import fake_network_cache_model diff --git a/nova/tests/network/test_quantum.py b/nova/tests/network/test_quantum.py index 7f93c9c2ba38..cd6c4b8cbc41 100644 --- a/nova/tests/network/test_quantum.py +++ b/nova/tests/network/test_quantum.py @@ -23,13 +23,13 @@ from nova.db.sqlalchemy import models from nova.db.sqlalchemy import session as sql_session from nova import exception from nova import flags -from nova import log as logging from nova.network.quantum import client as quantum_client from nova.network.quantum import fake_client from nova.network.quantum import manager as quantum_manager from nova.network.quantum import melange_connection from nova.network.quantum import melange_ipam_lib from nova.network.quantum import quantum_connection +from nova.openstack.common import log as logging from nova import test from nova import utils diff --git a/nova/tests/notifier/test_list_notifier.py b/nova/tests/notifier/test_list_notifier.py index bd1da9947813..bb14fa80ea94 100644 --- a/nova/tests/notifier/test_list_notifier.py +++ b/nova/tests/notifier/test_list_notifier.py @@ -14,11 +14,11 @@ # under the License. import nova -from nova import log as logging import nova.notifier.api from nova.notifier import list_notifier import nova.notifier.log_notifier import nova.notifier.no_op_notifier +from nova.openstack.common import log as logging from nova import test diff --git a/nova/tests/test_SolidFireSanISCSIDriver.py b/nova/tests/test_SolidFireSanISCSIDriver.py index 9ebab6d5f5a0..dd0e8d0de731 100644 --- a/nova/tests/test_SolidFireSanISCSIDriver.py +++ b/nova/tests/test_SolidFireSanISCSIDriver.py @@ -16,7 +16,7 @@ # under the License. from nova import exception -from nova import log as logging +from nova.openstack.common import log as logging from nova import test from nova.volume import san diff --git a/nova/tests/test_auth.py b/nova/tests/test_auth.py index afee021cd27b..1027a6a0a66b 100644 --- a/nova/tests/test_auth.py +++ b/nova/tests/test_auth.py @@ -22,7 +22,7 @@ from nova.auth import fakeldap from nova.auth import manager from nova import exception from nova import flags -from nova import log as logging +from nova.openstack.common import log as logging from nova import test FLAGS = flags.FLAGS diff --git a/nova/tests/test_compute_utils.py b/nova/tests/test_compute_utils.py index 0955134bafab..4e00025bca54 100644 --- a/nova/tests/test_compute_utils.py +++ b/nova/tests/test_compute_utils.py @@ -22,9 +22,9 @@ from nova.compute import utils as compute_utils from nova import context from nova import db from nova import flags -from nova import log as logging from nova.notifier import test_notifier from nova.openstack.common import importutils +from nova.openstack.common import log as logging from nova import test from nova.tests import fake_network import nova.tests.image.fake diff --git a/nova/tests/test_imagecache.py b/nova/tests/test_imagecache.py index 9ab10cc51a53..4ac7adfadee3 100644 --- a/nova/tests/test_imagecache.py +++ b/nova/tests/test_imagecache.py @@ -29,7 +29,7 @@ from nova import test from nova.compute import vm_states from nova import db from nova import flags -from nova import log +from nova.openstack.common import log from nova import utils from nova.virt.libvirt import imagecache from nova.virt.libvirt import utils as virtutils @@ -335,10 +335,10 @@ class ImageCacheManagerTestCase(test.TestCase): @contextlib.contextmanager def _intercept_log_messages(self): try: - mylog = log.getLogger() + mylog = log.getLogger('nova') stream = cStringIO.StringIO() handler = logging.StreamHandler(stream) - handler.setFormatter(log.LegacyNovaFormatter()) + handler.setFormatter(log.LegacyFormatter()) mylog.logger.addHandler(handler) yield stream finally: diff --git a/nova/tests/test_instance_types.py b/nova/tests/test_instance_types.py index 0d0417d0f9e8..ed33a74b054d 100644 --- a/nova/tests/test_instance_types.py +++ b/nova/tests/test_instance_types.py @@ -24,7 +24,7 @@ from nova.db.sqlalchemy import models from nova.db.sqlalchemy import session as sql_session from nova import exception from nova import flags -from nova import log as logging +from nova.openstack.common import log as logging from nova import test FLAGS = flags.FLAGS diff --git a/nova/tests/test_ipv6.py b/nova/tests/test_ipv6.py index a09482ddd79a..b16855eb4090 100644 --- a/nova/tests/test_ipv6.py +++ b/nova/tests/test_ipv6.py @@ -17,7 +17,7 @@ """Test suite for IPv6.""" from nova import ipv6 -from nova import log as logging +from nova.openstack.common import log as logging from nova import test LOG = logging.getLogger(__name__) diff --git a/nova/tests/test_libvirt.py b/nova/tests/test_libvirt.py index 55163b4c43f3..a05c8c96b1f3 100644 --- a/nova/tests/test_libvirt.py +++ b/nova/tests/test_libvirt.py @@ -34,9 +34,9 @@ from nova import context from nova import db from nova import exception from nova import flags -from nova import log as logging from nova.openstack.common import importutils from nova.openstack.common import jsonutils +from nova.openstack.common import log as logging from nova import test from nova.tests import fake_libvirt_utils from nova.tests import fake_network diff --git a/nova/tests/test_log.py b/nova/tests/test_log.py deleted file mode 100644 index 9597b99c6448..000000000000 --- a/nova/tests/test_log.py +++ /dev/null @@ -1,217 +0,0 @@ -import cStringIO -import logging - -from nova import context -from nova import flags -from nova import log -from nova.notifier import api as notifier -from nova.openstack.common import jsonutils -from nova import test - -FLAGS = flags.FLAGS -flags.DECLARE('list_notifier_drivers', - 'nova.notifier.list_notifier') - - -def _fake_context(): - return context.RequestContext(1, 1) - - -class LoggerTestCase(test.TestCase): - def setUp(self): - super(LoggerTestCase, self).setUp() - self.log = log.getLogger() - - def test_handlers_have_nova_formatter(self): - formatters = [] - for h in self.log.logger.handlers: - f = h.formatter - if isinstance(f, log.LegacyNovaFormatter): - formatters.append(f) - self.assert_(formatters) - self.assertEqual(len(formatters), len(self.log.logger.handlers)) - - def test_handles_context_kwarg(self): - self.log.info("foo", context=_fake_context()) - self.assert_(True) # didn't raise exception - - def test_audit_handles_context_arg(self): - self.log.audit("foo", context=_fake_context()) - self.assert_(True) # didn't raise exception - - def test_will_be_verbose_if_verbose_flag_set(self): - self.flags(verbose=True) - log.setup() - self.assertEqual(logging.DEBUG, self.log.logger.getEffectiveLevel()) - - def test_will_not_be_verbose_if_verbose_flag_not_set(self): - self.flags(verbose=False) - log.setup() - self.assertEqual(logging.INFO, self.log.logger.getEffectiveLevel()) - - def test_no_logging_via_module(self): - for func in ('critical', 'error', 'exception', 'warning', 'warn', - 'info', 'debug', 'log', 'audit'): - self.assertRaises(AttributeError, getattr, log, func) - - -class LogHandlerTestCase(test.TestCase): - def test_log_path_logdir(self): - self.flags(logdir='/some/path', logfile=None) - self.assertEquals(log._get_log_file_path(binary='foo-bar'), - '/some/path/foo-bar.log') - - def test_log_path_logfile(self): - self.flags(logfile='/some/path/foo-bar.log') - self.assertEquals(log._get_log_file_path(binary='foo-bar'), - '/some/path/foo-bar.log') - - def test_log_path_none(self): - self.flags(logdir=None, logfile=None) - self.assertTrue(log._get_log_file_path(binary='foo-bar') is None) - - def test_log_path_logfile_overrides_logdir(self): - self.flags(logdir='/some/other/path', - logfile='/some/path/foo-bar.log') - self.assertEquals(log._get_log_file_path(binary='foo-bar'), - '/some/path/foo-bar.log') - - -class PublishErrorsHandlerTestCase(test.TestCase): - """Tests for nova.log.PublishErrorsHandler""" - def setUp(self): - super(PublishErrorsHandlerTestCase, self).setUp() - self.publiserrorshandler = log.PublishErrorsHandler(logging.ERROR) - - def test_emit_cfg_list_notifier_drivers_in_flags(self): - self.stub_flg = False - - def fake_notifier(*args, **kwargs): - self.stub_flg = True - - self.stubs.Set(notifier, 'notify', fake_notifier) - logrecord = logging.LogRecord('name', 'WARN', '/tmp', 1, - 'Message', None, None) - self.publiserrorshandler.emit(logrecord) - self.assertTrue(self.stub_flg) - - def test_emit_cfg_log_notifier_in_list_notifier_drivers(self): - self.flags(list_notifier_drivers=['nova.notifier.rabbit_notifier', - 'nova.notifier.log_notifier']) - self.stub_flg = True - - def fake_notifier(*args, **kwargs): - self.stub_flg = False - - self.stubs.Set(notifier, 'notify', fake_notifier) - logrecord = logging.LogRecord('name', 'WARN', '/tmp', 1, - 'Message', None, None) - self.publiserrorshandler.emit(logrecord) - self.assertTrue(self.stub_flg) - - -class NovaFormatterTestCase(test.TestCase): - def setUp(self): - super(NovaFormatterTestCase, self).setUp() - self.flags(logging_context_format_string="HAS CONTEXT " - "[%(request_id)s]: " - "%(message)s", - logging_default_format_string="NOCTXT: %(message)s", - logging_debug_format_suffix="--DBG") - self.log = log.getLogger() - self.stream = cStringIO.StringIO() - self.handler = logging.StreamHandler(self.stream) - self.handler.setFormatter(log.LegacyNovaFormatter()) - self.log.logger.addHandler(self.handler) - self.level = self.log.logger.getEffectiveLevel() - self.log.logger.setLevel(logging.DEBUG) - - def tearDown(self): - self.log.logger.setLevel(self.level) - self.log.logger.removeHandler(self.handler) - super(NovaFormatterTestCase, self).tearDown() - - def test_uncontextualized_log(self): - self.log.info("foo") - self.assertEqual("NOCTXT: foo\n", self.stream.getvalue()) - - def test_contextualized_log(self): - ctxt = _fake_context() - self.log.info("bar", context=ctxt) - expected = "HAS CONTEXT [%s]: bar\n" % ctxt.request_id - self.assertEqual(expected, self.stream.getvalue()) - - def test_debugging_log(self): - self.log.debug("baz") - self.assertEqual("NOCTXT: baz --DBG\n", self.stream.getvalue()) - - -class NovaLoggerTestCase(test.TestCase): - def setUp(self): - super(NovaLoggerTestCase, self).setUp() - levels = FLAGS.default_log_levels - levels.append("nova-test=AUDIT") - self.flags(default_log_levels=levels, - verbose=True) - log.setup() - self.log = log.getLogger('nova-test') - - def test_has_level_from_flags(self): - self.assertEqual(logging.AUDIT, self.log.logger.getEffectiveLevel()) - - def test_child_log_has_level_of_parent_flag(self): - l = log.getLogger('nova-test.foo') - self.assertEqual(logging.AUDIT, l.logger.getEffectiveLevel()) - - -class JSONFormatterTestCase(test.TestCase): - def setUp(self): - super(JSONFormatterTestCase, self).setUp() - self.log = log.getLogger('test-json') - self.stream = cStringIO.StringIO() - handler = logging.StreamHandler(self.stream) - handler.setFormatter(log.JSONFormatter()) - self.log.logger.addHandler(handler) - self.log.logger.setLevel(logging.DEBUG) - - def test_json(self): - test_msg = 'This is a %(test)s line' - test_data = {'test': 'log'} - self.log.debug(test_msg, test_data) - - data = jsonutils.loads(self.stream.getvalue()) - self.assertTrue(data) - self.assertTrue('extra' in data) - self.assertEqual('test-json', data['name']) - - self.assertEqual(test_msg % test_data, data['message']) - self.assertEqual(test_msg, data['msg']) - self.assertEqual(test_data, data['args']) - - self.assertEqual('test_log.py', data['filename']) - self.assertEqual('test_json', data['funcname']) - - self.assertEqual('DEBUG', data['levelname']) - self.assertEqual(logging.DEBUG, data['levelno']) - self.assertFalse(data['traceback']) - - def test_json_exception(self): - test_msg = 'This is %s' - test_data = 'exceptional' - try: - raise Exception('This is exceptional') - except Exception: - self.log.exception(test_msg, test_data) - - data = jsonutils.loads(self.stream.getvalue()) - self.assertTrue(data) - self.assertTrue('extra' in data) - self.assertEqual('test-json', data['name']) - - self.assertEqual(test_msg % test_data, data['message']) - self.assertEqual(test_msg, data['msg']) - self.assertEqual([test_data], data['args']) - - self.assertEqual('ERROR', data['levelname']) - self.assertEqual(logging.ERROR, data['levelno']) - self.assertTrue(data['traceback']) diff --git a/nova/tests/test_migrations.py b/nova/tests/test_migrations.py index fc654c80a439..1e3ca5888510 100644 --- a/nova/tests/test_migrations.py +++ b/nova/tests/test_migrations.py @@ -35,7 +35,7 @@ import sqlalchemy import nova.db.migration as migration import nova.db.sqlalchemy.migrate_repo from nova.db.sqlalchemy.migration import versioning_api as migration_api -from nova import log as logging +from nova.openstack.common import log as logging from nova import test diff --git a/nova/tests/test_netapp.py b/nova/tests/test_netapp.py index 8412420afe2a..50b0f9c7ec0d 100644 --- a/nova/tests/test_netapp.py +++ b/nova/tests/test_netapp.py @@ -25,7 +25,7 @@ import StringIO from lxml import etree -from nova import log as logging +from nova.openstack.common import log as logging from nova import test from nova.volume import netapp diff --git a/nova/tests/test_notifications.py b/nova/tests/test_notifications.py index 0f44064daf56..cf12d5629c94 100644 --- a/nova/tests/test_notifications.py +++ b/nova/tests/test_notifications.py @@ -25,10 +25,10 @@ from nova.compute import vm_states from nova import context from nova import db from nova import flags -from nova import log as logging import nova.network from nova import notifications from nova.notifier import test_notifier +from nova.openstack.common import log as logging from nova import test from nova.tests import fake_network diff --git a/nova/tests/test_notifier.py b/nova/tests/test_notifier.py index 773ffe49b5b9..f7f54f374ed0 100644 --- a/nova/tests/test_notifier.py +++ b/nova/tests/test_notifier.py @@ -16,9 +16,9 @@ import nova from nova import context from nova import flags -from nova import log from nova.notifier import api as notifier_api import nova.notifier.no_op_notifier +from nova.openstack.common import log from nova import test @@ -106,7 +106,7 @@ class NotifierTestCase(test.TestCase): 'nova.notifier.rabbit_notifier') self.stubs.Set(nova.flags.FLAGS, 'publish_errors', True) LOG = log.getLogger('nova') - log.setup() + log.setup('nova') msgs = [] def mock_notify(context, topic, data): diff --git a/nova/tests/test_virt_drivers.py b/nova/tests/test_virt_drivers.py index 6443c6721756..cafbd68183fa 100644 --- a/nova/tests/test_virt_drivers.py +++ b/nova/tests/test_virt_drivers.py @@ -21,8 +21,8 @@ import traceback from nova.compute.manager import ComputeManager from nova import exception -from nova import log as logging from nova.openstack.common import importutils +from nova.openstack.common import log as logging from nova import test from nova.tests.image import fake as fake_image from nova.tests import utils as test_utils diff --git a/nova/tests/test_volume.py b/nova/tests/test_volume.py index 0aac9e8cf2c5..2e149f950e79 100644 --- a/nova/tests/test_volume.py +++ b/nova/tests/test_volume.py @@ -28,9 +28,9 @@ from nova import context from nova import db from nova import exception from nova import flags -from nova import log as logging from nova.notifier import test_notifier from nova.openstack.common import importutils +from nova.openstack.common import log as logging from nova.openstack.common import rpc import nova.policy from nova import quota @@ -430,7 +430,7 @@ class DriverTestCase(test.TestCase): return self.output, None self.volume.driver.set_execute(_fake_execute) - log = logging.getLogger() + log = logging.getLogger('nova') self.stream = cStringIO.StringIO() log.logger.addHandler(logging.logging.StreamHandler(self.stream)) diff --git a/nova/tests/test_volume_types.py b/nova/tests/test_volume_types.py index d2680afaf569..764cf034369c 100644 --- a/nova/tests/test_volume_types.py +++ b/nova/tests/test_volume_types.py @@ -23,7 +23,7 @@ from nova.db.sqlalchemy import models from nova.db.sqlalchemy import session as sql_session from nova import exception from nova import flags -from nova import log as logging +from nova.openstack.common import log as logging from nova import test from nova.volume import volume_types diff --git a/nova/tests/test_volume_utils.py b/nova/tests/test_volume_utils.py index b2ccb41b899d..1db0f9eef804 100644 --- a/nova/tests/test_volume_utils.py +++ b/nova/tests/test_volume_utils.py @@ -20,9 +20,9 @@ from nova import context from nova import db from nova import flags -from nova import log as logging from nova.notifier import test_notifier from nova.openstack.common import importutils +from nova.openstack.common import log as logging from nova import test from nova.volume import utils as volume_utils diff --git a/nova/tests/test_xenapi.py b/nova/tests/test_xenapi.py index c4b3262f5415..5181e638525f 100644 --- a/nova/tests/test_xenapi.py +++ b/nova/tests/test_xenapi.py @@ -29,8 +29,8 @@ from nova import context from nova import db from nova import exception from nova import flags -from nova import log as logging from nova.openstack.common import importutils +from nova.openstack.common import log as logging from nova.openstack.common import timeutils from nova import test from nova.tests.db import fakes as db_fakes diff --git a/nova/tests/test_xensm.py b/nova/tests/test_xensm.py index 638a359fa2e1..18be0266c7e0 100644 --- a/nova/tests/test_xensm.py +++ b/nova/tests/test_xensm.py @@ -22,7 +22,7 @@ from nova import context from nova import db from nova import exception from nova import flags -from nova import log as logging +from nova.openstack.common import log as logging from nova import test from nova.tests.xenapi import stubs from nova.virt.xenapi import connection as xenapi_conn diff --git a/nova/tests/volume/test_HpSanISCSIDriver.py b/nova/tests/volume/test_HpSanISCSIDriver.py index 705152536a73..b3656bb22010 100644 --- a/nova/tests/volume/test_HpSanISCSIDriver.py +++ b/nova/tests/volume/test_HpSanISCSIDriver.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. from nova import exception -from nova import log as logging +from nova.openstack.common import log as logging from nova import test from nova.volume import san diff --git a/nova/utils.py b/nova/utils.py index 9560c1d18a03..b9af41fcaee0 100644 --- a/nova/utils.py +++ b/nova/utils.py @@ -51,10 +51,10 @@ import netaddr from nova import exception from nova import flags -from nova import log as logging from nova.openstack.common import cfg from nova.openstack.common import excutils from nova.openstack.common import importutils +from nova.openstack.common import log as logging from nova.openstack.common import timeutils diff --git a/nova/virt/baremetal/dom.py b/nova/virt/baremetal/dom.py index 0890de5d4cfd..350506f73c7e 100644 --- a/nova/virt/baremetal/dom.py +++ b/nova/virt/baremetal/dom.py @@ -17,8 +17,8 @@ from nova.compute import power_state from nova import exception from nova import flags -from nova import log as logging from nova.openstack.common import jsonutils +from nova.openstack.common import log as logging from nova.virt.baremetal import nodes FLAGS = flags.FLAGS diff --git a/nova/virt/baremetal/proxy.py b/nova/virt/baremetal/proxy.py index f1aa908bb4ca..56ed127153ef 100644 --- a/nova/virt/baremetal/proxy.py +++ b/nova/virt/baremetal/proxy.py @@ -40,9 +40,9 @@ from nova import context as nova_context from nova import db from nova import exception from nova import flags -from nova import log as logging from nova import notifications from nova.openstack.common import cfg +from nova.openstack.common import log as logging from nova import utils from nova.virt.baremetal import dom from nova.virt.baremetal import nodes diff --git a/nova/virt/baremetal/tilera.py b/nova/virt/baremetal/tilera.py index 36d499cc20fd..4d4a37007421 100644 --- a/nova/virt/baremetal/tilera.py +++ b/nova/virt/baremetal/tilera.py @@ -28,8 +28,8 @@ import time from nova.compute import power_state from nova import exception from nova import flags -from nova import log as logging from nova.openstack.common import cfg +from nova.openstack.common import log as logging from nova import utils FLAGS = flags.FLAGS diff --git a/nova/virt/connection.py b/nova/virt/connection.py index 079675da3fbd..8c98945a265e 100644 --- a/nova/virt/connection.py +++ b/nova/virt/connection.py @@ -24,8 +24,8 @@ import sys from nova.common import deprecated from nova import exception from nova import flags -from nova import log as logging from nova.openstack.common import importutils +from nova.openstack.common import log as logging from nova import utils from nova.virt import driver diff --git a/nova/virt/disk/api.py b/nova/virt/disk/api.py index 672b5d50ed8e..42d9d916260d 100644 --- a/nova/virt/disk/api.py +++ b/nova/virt/disk/api.py @@ -33,9 +33,9 @@ import tempfile from nova import exception from nova import flags -from nova import log as logging from nova.openstack.common import cfg from nova.openstack.common import jsonutils +from nova.openstack.common import log as logging from nova import utils from nova.virt.disk import guestfs from nova.virt.disk import loop diff --git a/nova/virt/disk/mount.py b/nova/virt/disk/mount.py index 11959b2f66c3..7811677530c7 100644 --- a/nova/virt/disk/mount.py +++ b/nova/virt/disk/mount.py @@ -17,7 +17,7 @@ import os -from nova import log as logging +from nova.openstack.common import log as logging from nova import utils LOG = logging.getLogger(__name__) diff --git a/nova/virt/driver.py b/nova/virt/driver.py index f7dfbf7cd0f0..d01fc78989eb 100644 --- a/nova/virt/driver.py +++ b/nova/virt/driver.py @@ -24,7 +24,7 @@ Driver base-classes: from nova.compute import power_state from nova import flags -from nova import log as logging +from nova.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/nova/virt/fake.py b/nova/virt/fake.py index f13f71a8d1f8..85253c0fa90c 100644 --- a/nova/virt/fake.py +++ b/nova/virt/fake.py @@ -28,7 +28,7 @@ semantics of real hypervisor connections. from nova.compute import power_state from nova import db from nova import exception -from nova import log as logging +from nova.openstack.common import log as logging from nova import utils from nova.virt import driver diff --git a/nova/virt/firewall.py b/nova/virt/firewall.py index 89559a829200..2afb8b6cf8e3 100644 --- a/nova/virt/firewall.py +++ b/nova/virt/firewall.py @@ -20,8 +20,8 @@ from nova import context from nova import db from nova import flags -from nova import log as logging from nova.openstack.common import cfg +from nova.openstack.common import log as logging from nova import utils from nova.virt import netutils diff --git a/nova/virt/images.py b/nova/virt/images.py index 78bd8aebcd61..c80e83e2324f 100644 --- a/nova/virt/images.py +++ b/nova/virt/images.py @@ -26,8 +26,8 @@ import os from nova import exception from nova import flags from nova.image import glance -from nova import log as logging from nova.openstack.common import cfg +from nova.openstack.common import log as logging from nova import utils diff --git a/nova/virt/libvirt/config.py b/nova/virt/libvirt/config.py index edde66d7c4a0..da55dc23440c 100644 --- a/nova/virt/libvirt/config.py +++ b/nova/virt/libvirt/config.py @@ -22,7 +22,7 @@ and support conversion to/from XML """ from nova import exception -from nova import log as logging +from nova.openstack.common import log as logging from lxml import etree diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py index 950494d973a3..3a5a52b797a5 100644 --- a/nova/virt/libvirt/driver.py +++ b/nova/virt/libvirt/driver.py @@ -61,11 +61,11 @@ from nova import db from nova import exception from nova import flags from nova.image import glance -from nova import log as logging from nova.openstack.common import cfg from nova.openstack.common import excutils from nova.openstack.common import importutils from nova.openstack.common import jsonutils +from nova.openstack.common import log as logging from nova import utils from nova.virt.disk import api as disk from nova.virt import driver diff --git a/nova/virt/libvirt/firewall.py b/nova/virt/libvirt/firewall.py index 00823305bb24..b373a3b90420 100644 --- a/nova/virt/libvirt/firewall.py +++ b/nova/virt/libvirt/firewall.py @@ -21,7 +21,7 @@ from eventlet import tpool from nova import flags -from nova import log as logging +from nova.openstack.common import log as logging import nova.virt.firewall as base_firewall diff --git a/nova/virt/libvirt/imagecache.py b/nova/virt/libvirt/imagecache.py index 9e800e3dd643..01c0046a01d3 100644 --- a/nova/virt/libvirt/imagecache.py +++ b/nova/virt/libvirt/imagecache.py @@ -32,8 +32,8 @@ from nova.compute import task_states from nova.compute import vm_states from nova import db from nova import flags -from nova import log as logging from nova.openstack.common import cfg +from nova.openstack.common import log as logging from nova import utils from nova.virt.libvirt import utils as virtutils diff --git a/nova/virt/libvirt/utils.py b/nova/virt/libvirt/utils.py index 363c692aa025..b4bb08f87c1a 100644 --- a/nova/virt/libvirt/utils.py +++ b/nova/virt/libvirt/utils.py @@ -26,9 +26,9 @@ import re from nova import exception from nova import flags -from nova import log as logging from nova.openstack.common import cfg from nova.openstack.common import jsonutils +from nova.openstack.common import log as logging from nova import utils from nova.virt import images diff --git a/nova/virt/libvirt/vif.py b/nova/virt/libvirt/vif.py index 3a93cf3c88f6..74c21fc51768 100644 --- a/nova/virt/libvirt/vif.py +++ b/nova/virt/libvirt/vif.py @@ -21,9 +21,9 @@ from nova import exception from nova import flags -from nova import log as logging from nova.network import linux_net from nova.openstack.common import cfg +from nova.openstack.common import log as logging from nova import utils from nova.virt import netutils from nova.virt import vif diff --git a/nova/virt/libvirt/volume.py b/nova/virt/libvirt/volume.py index 839a00db2a85..dfba9325c31e 100644 --- a/nova/virt/libvirt/volume.py +++ b/nova/virt/libvirt/volume.py @@ -22,7 +22,7 @@ import time from nova import exception from nova import flags -from nova import log as logging +from nova.openstack.common import log as logging from nova import utils from nova.virt.libvirt import config diff --git a/nova/virt/vmwareapi/fake.py b/nova/virt/vmwareapi/fake.py index 10f834ba15c7..fdf85dc8b3db 100644 --- a/nova/virt/vmwareapi/fake.py +++ b/nova/virt/vmwareapi/fake.py @@ -23,7 +23,7 @@ import pprint import uuid from nova import exception -from nova import log as logging +from nova.openstack.common import log as logging from nova.virt.vmwareapi import error_util _CLASSES = ['Datacenter', 'Datastore', 'ResourcePool', 'VirtualMachine', diff --git a/nova/virt/vmwareapi/io_util.py b/nova/virt/vmwareapi/io_util.py index d8dd46b2fd6b..999e7a085451 100644 --- a/nova/virt/vmwareapi/io_util.py +++ b/nova/virt/vmwareapi/io_util.py @@ -25,7 +25,7 @@ from eventlet import greenthread from eventlet import queue from nova import exception -from nova import log as logging +from nova.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/nova/virt/vmwareapi/network_utils.py b/nova/virt/vmwareapi/network_utils.py index 1f051fa7e3c1..97d9d6c26cc1 100644 --- a/nova/virt/vmwareapi/network_utils.py +++ b/nova/virt/vmwareapi/network_utils.py @@ -20,7 +20,7 @@ Utility functions for ESX Networking. """ from nova import exception -from nova import log as logging +from nova.openstack.common import log as logging from nova.virt.vmwareapi import error_util from nova.virt.vmwareapi import vim_util from nova.virt.vmwareapi import vm_util diff --git a/nova/virt/vmwareapi/read_write_util.py b/nova/virt/vmwareapi/read_write_util.py index 08da0144882e..765b94cc6ba0 100644 --- a/nova/virt/vmwareapi/read_write_util.py +++ b/nova/virt/vmwareapi/read_write_util.py @@ -30,7 +30,7 @@ import urlparse from glance import client from nova import flags -from nova import log as logging +from nova.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/nova/virt/vmwareapi/vif.py b/nova/virt/vmwareapi/vif.py index 52205c461b37..a00dd5c36e4c 100644 --- a/nova/virt/vmwareapi/vif.py +++ b/nova/virt/vmwareapi/vif.py @@ -19,7 +19,7 @@ from nova import exception from nova import flags -from nova import log as logging +from nova.openstack.common import log as logging from nova.virt import vif from nova.virt.vmwareapi import network_utils diff --git a/nova/virt/vmwareapi/vmops.py b/nova/virt/vmwareapi/vmops.py index 000dc69816c1..f650316da173 100644 --- a/nova/virt/vmwareapi/vmops.py +++ b/nova/virt/vmwareapi/vmops.py @@ -29,9 +29,9 @@ import uuid from nova.compute import power_state from nova import exception from nova import flags -from nova import log as logging from nova.openstack.common import cfg from nova.openstack.common import importutils +from nova.openstack.common import log as logging from nova.virt.vmwareapi import network_utils from nova.virt.vmwareapi import vim_util from nova.virt.vmwareapi import vm_util diff --git a/nova/virt/vmwareapi/vmware_images.py b/nova/virt/vmwareapi/vmware_images.py index c1ab77fa5e37..bb7219feb0fc 100644 --- a/nova/virt/vmwareapi/vmware_images.py +++ b/nova/virt/vmwareapi/vmware_images.py @@ -21,7 +21,7 @@ import StringIO from nova import exception from nova.image import glance -from nova import log as logging +from nova.openstack.common import log as logging from nova.virt.vmwareapi import io_util from nova.virt.vmwareapi import read_write_util diff --git a/nova/virt/vmwareapi_conn.py b/nova/virt/vmwareapi_conn.py index 0c66791a698b..2b1d4cedf0b6 100644 --- a/nova/virt/vmwareapi_conn.py +++ b/nova/virt/vmwareapi_conn.py @@ -38,8 +38,8 @@ from eventlet import event from nova import exception from nova import flags -from nova import log as logging from nova.openstack.common import cfg +from nova.openstack.common import log as logging from nova import utils from nova.virt import driver from nova.virt.vmwareapi import error_util diff --git a/nova/virt/xenapi/connection.py b/nova/virt/xenapi/connection.py index 20f9745d22bc..2777fa883251 100644 --- a/nova/virt/xenapi/connection.py +++ b/nova/virt/xenapi/connection.py @@ -49,8 +49,8 @@ from nova import context from nova import db from nova import exception from nova import flags -from nova import log as logging from nova.openstack.common import cfg +from nova.openstack.common import log as logging from nova.virt import driver from nova.virt.xenapi import host from nova.virt.xenapi import pool diff --git a/nova/virt/xenapi/fake.py b/nova/virt/xenapi/fake.py index 5df0c2aead5b..48c9c1083026 100644 --- a/nova/virt/xenapi/fake.py +++ b/nova/virt/xenapi/fake.py @@ -58,8 +58,8 @@ from xml.sax import saxutils import pprint from nova import exception -from nova import log as logging from nova.openstack.common import jsonutils +from nova.openstack.common import log as logging from nova.openstack.common import timeutils diff --git a/nova/virt/xenapi/firewall.py b/nova/virt/xenapi/firewall.py index 094da44eb6e5..3c974fc0f214 100644 --- a/nova/virt/xenapi/firewall.py +++ b/nova/virt/xenapi/firewall.py @@ -20,8 +20,8 @@ from nova import context from nova.db import api as db from nova import flags -from nova import log as logging from nova.openstack.common import jsonutils +from nova.openstack.common import log as logging from nova.virt import firewall from nova.virt import netutils diff --git a/nova/virt/xenapi/pool.py b/nova/virt/xenapi/pool.py index 7b0c576bfbef..cb00faed51b6 100644 --- a/nova/virt/xenapi/pool.py +++ b/nova/virt/xenapi/pool.py @@ -25,9 +25,9 @@ from nova.compute import aggregate_states from nova import db from nova import exception from nova import flags -from nova import log as logging from nova.openstack.common import cfg from nova.openstack.common import jsonutils +from nova.openstack.common import log as logging from nova.openstack.common import rpc from nova.virt.xenapi import vm_utils diff --git a/nova/virt/xenapi/vif.py b/nova/virt/xenapi/vif.py index 39778521bb3b..4977fd4cf1ef 100644 --- a/nova/virt/xenapi/vif.py +++ b/nova/virt/xenapi/vif.py @@ -20,8 +20,8 @@ """VIF drivers for XenAPI.""" from nova import flags -from nova import log as logging from nova.openstack.common import cfg +from nova.openstack.common import log as logging from nova.virt import vif from nova.virt.xenapi import network_utils from nova.virt.xenapi import vm_utils diff --git a/nova/virt/xenapi/vm_utils.py b/nova/virt/xenapi/vm_utils.py index 9c7399606935..61cf74f91309 100644 --- a/nova/virt/xenapi/vm_utils.py +++ b/nova/virt/xenapi/vm_utils.py @@ -40,10 +40,10 @@ from nova import db from nova import exception from nova import flags from nova.image import glance -from nova import log as logging from nova.openstack.common import cfg from nova.openstack.common import excutils from nova.openstack.common import jsonutils +from nova.openstack.common import log as logging from nova import utils from nova.virt.disk import api as disk from nova.virt import xenapi diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py index 5797557fe1da..85fe73cd8916 100644 --- a/nova/virt/xenapi/vmops.py +++ b/nova/virt/xenapi/vmops.py @@ -36,10 +36,10 @@ from nova import context as nova_context from nova import db from nova import exception from nova import flags -from nova import log as logging from nova.openstack.common import cfg from nova.openstack.common import importutils from nova.openstack.common import jsonutils +from nova.openstack.common import log as logging from nova.openstack.common import timeutils from nova import utils from nova.virt import driver diff --git a/nova/virt/xenapi/volume_utils.py b/nova/virt/xenapi/volume_utils.py index 143970cfb515..d64394980229 100644 --- a/nova/virt/xenapi/volume_utils.py +++ b/nova/virt/xenapi/volume_utils.py @@ -23,7 +23,7 @@ import re import string from nova import flags -from nova import log as logging +from nova.openstack.common import log as logging FLAGS = flags.FLAGS diff --git a/nova/virt/xenapi/volumeops.py b/nova/virt/xenapi/volumeops.py index c90df787bd44..412b89be5bc9 100644 --- a/nova/virt/xenapi/volumeops.py +++ b/nova/virt/xenapi/volumeops.py @@ -19,7 +19,7 @@ Management class for Storage-related functions (attach, detach, etc). """ from nova import exception -from nova import log as logging +from nova.openstack.common import log as logging from nova.virt.xenapi import vm_utils from nova.virt.xenapi import volume_utils diff --git a/nova/vnc/xvp_proxy.py b/nova/vnc/xvp_proxy.py index ecf5c2551e81..c8b779a37102 100644 --- a/nova/vnc/xvp_proxy.py +++ b/nova/vnc/xvp_proxy.py @@ -29,8 +29,8 @@ import eventlet.wsgi from nova.consoleauth import rpcapi as consoleauth_rpcapi from nova import context from nova import flags -from nova import log as logging from nova.openstack.common import cfg +from nova.openstack.common import log as logging from nova import version from nova import wsgi diff --git a/nova/volume/api.py b/nova/volume/api.py index 748b2d16b178..28f78a7e126b 100644 --- a/nova/volume/api.py +++ b/nova/volume/api.py @@ -25,7 +25,7 @@ import functools from nova.db import base from nova import exception from nova import flags -from nova import log as logging +from nova.openstack.common import log as logging from nova.openstack.common import rpc from nova.openstack.common import timeutils import nova.policy diff --git a/nova/volume/driver.py b/nova/volume/driver.py index 2b0d457e5491..9e8355a3aa3d 100644 --- a/nova/volume/driver.py +++ b/nova/volume/driver.py @@ -24,8 +24,8 @@ import time from nova import exception from nova import flags -from nova import log as logging from nova.openstack.common import cfg +from nova.openstack.common import log as logging from nova import utils from nova.volume import iscsi diff --git a/nova/volume/manager.py b/nova/volume/manager.py index 972c4b5ec7a8..8aceace5f026 100644 --- a/nova/volume/manager.py +++ b/nova/volume/manager.py @@ -41,11 +41,11 @@ intact. from nova import context from nova import exception from nova import flags -from nova import log as logging from nova import manager from nova.openstack.common import cfg from nova.openstack.common import excutils from nova.openstack.common import importutils +from nova.openstack.common import log as logging from nova.openstack.common import timeutils from nova import quota from nova import utils diff --git a/nova/volume/netapp.py b/nova/volume/netapp.py index 897da62040c3..57c1b8db413b 100644 --- a/nova/volume/netapp.py +++ b/nova/volume/netapp.py @@ -32,8 +32,8 @@ from suds.sax import text from nova import exception from nova import flags -from nova import log as logging from nova.openstack.common import cfg +from nova.openstack.common import log as logging from nova.volume import driver LOG = logging.getLogger(__name__) diff --git a/nova/volume/nexenta/jsonrpc.py b/nova/volume/nexenta/jsonrpc.py index c0665e3dc1f3..e0d9c810a98e 100644 --- a/nova/volume/nexenta/jsonrpc.py +++ b/nova/volume/nexenta/jsonrpc.py @@ -24,8 +24,8 @@ import urllib2 -from nova import log as logging from nova.openstack.common import jsonutils +from nova.openstack.common import log as logging from nova.volume import nexenta LOG = logging.getLogger(__name__) diff --git a/nova/volume/nexenta/volume.py b/nova/volume/nexenta/volume.py index 784d48d4feeb..9bb6364a9069 100644 --- a/nova/volume/nexenta/volume.py +++ b/nova/volume/nexenta/volume.py @@ -24,8 +24,8 @@ from nova import exception from nova import flags -from nova import log as logging from nova.openstack.common import cfg +from nova.openstack.common import log as logging from nova.volume import driver from nova.volume import nexenta from nova.volume.nexenta import jsonrpc diff --git a/nova/volume/san.py b/nova/volume/san.py index e1fa2c2d3f94..a2b79c2984ab 100644 --- a/nova/volume/san.py +++ b/nova/volume/san.py @@ -34,9 +34,9 @@ from lxml import etree from nova import exception from nova import flags -from nova import log as logging from nova.openstack.common import cfg from nova.openstack.common import jsonutils +from nova.openstack.common import log as logging from nova import utils import nova.volume.driver diff --git a/nova/volume/utils.py b/nova/volume/utils.py index 7efd7f23a516..dcaa141f5103 100644 --- a/nova/volume/utils.py +++ b/nova/volume/utils.py @@ -17,8 +17,8 @@ """Volume-related Utilities and helpers.""" from nova import flags -from nova import log as logging from nova.notifier import api as notifier_api +from nova.openstack.common import log as logging from nova.openstack.common import timeutils from nova import utils diff --git a/nova/volume/volume_types.py b/nova/volume/volume_types.py index 0b8208663c41..67d8244659e2 100644 --- a/nova/volume/volume_types.py +++ b/nova/volume/volume_types.py @@ -25,7 +25,7 @@ from nova import context from nova import db from nova import exception from nova import flags -from nova import log as logging +from nova.openstack.common import log as logging FLAGS = flags.FLAGS LOG = logging.getLogger(__name__) diff --git a/nova/volume/xensm.py b/nova/volume/xensm.py index e834a312ac1e..db3a1d793ef6 100644 --- a/nova/volume/xensm.py +++ b/nova/volume/xensm.py @@ -14,7 +14,7 @@ from nova import exception from nova import flags -from nova import log as logging +from nova.openstack.common import log as logging from nova import utils from nova.virt.xenapi import connection as xenapi_conn from nova.virt.xenapi import volumeops diff --git a/nova/wsgi.py b/nova/wsgi.py index a02fdcc1825f..afb5303e4ab4 100644 --- a/nova/wsgi.py +++ b/nova/wsgi.py @@ -32,7 +32,7 @@ import webob.exc from nova import exception from nova import flags -from nova import log as logging +from nova.openstack.common import log as logging FLAGS = flags.FLAGS diff --git a/openstack-common.conf b/openstack-common.conf index ec446f1caf44..4eb15e0f2d7c 100644 --- a/openstack-common.conf +++ b/openstack-common.conf @@ -1,7 +1,7 @@ [DEFAULT] # The list of modules to copy from openstack-common -modules=cfg,excutils,importutils,iniparser,jsonutils,local,policy,setup,timeutils,rpc,gettextutils +modules=cfg,excutils,gettextutils,importutils,iniparser,jsonutils,local,log,policy,setup,timeutils,rpc # The base module to hold the copy of openstack.common base=nova diff --git a/tools/clean_file_locks.py b/tools/clean_file_locks.py index 790d82f674b4..39b7d695b411 100755 --- a/tools/clean_file_locks.py +++ b/tools/clean_file_locks.py @@ -26,7 +26,7 @@ import logging import optparse from nova import flags -from nova import log +from nova.openstack.common import log from nova import utils