Update 'logging' imports to openstack-common

Change-Id: Ia1a7b5062e7f882971f2061274f6a4a44cfc8ced

glance/api/middleware/cache.py

@@ -25,7 +25,6 @@ the local cached copy of the image file is returned.
 """
 
 import httplib
-import logging
 import re
 
 import webob
@@ -35,6 +34,7 @@ from glance.common import exception
 from glance.common import utils
 from glance.common import wsgi
 from glance import image_cache
+import glance.openstack.common.log as logging
 from glance import registry
 
 LOG = logging.getLogger(__name__)

glance/api/middleware/cache_manage.py

@@ -19,12 +19,11 @@
 Image Cache Management API
 """
 
-import logging
-
 import routes
 
 from glance.api import cached_images
 from glance.common import wsgi
+import glance.openstack.common.log as logging
 
 LOG = logging.getLogger(__name__)
 

glance/api/middleware/context.py

@@ -15,13 +15,14 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import logging
 import json
+
 import webob.exc
 
 from glance.common import wsgi
 import glance.context
 from glance.openstack.common import cfg
+import glance.openstack.common.log as logging
 
 
 context_opts = [

glance/api/middleware/version_negotiation.py

@@ -21,10 +21,9 @@ and/or Accept headers and attempts to negotiate an API controller to
 return
 """
 
-import logging
-
 from glance.api import versions
 from glance.common import wsgi
+import glance.openstack.common.log as logging
 
 LOG = logging.getLogger(__name__)
 

glance/api/policy.py

@@ -18,11 +18,11 @@
 """Policy Engine For Glance"""
 
 import json
-import logging
 import os.path
 
 from glance.common import exception
 from glance.openstack.common import cfg
+import glance.openstack.common.log as logging
 from glance.openstack.common import policy
 
 LOG = logging.getLogger(__name__)

glance/api/v1/controller.py

@@ -15,11 +15,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import logging
-
 import webob.exc
 
 from glance.common import exception
+import glance.openstack.common.log as logging
 from glance import registry
 
 LOG = logging.getLogger(__name__)

glance/api/v1/images.py

@@ -20,7 +20,6 @@
 """
 
 import errno
-import logging
 import sys
 import traceback
 
@@ -42,6 +41,7 @@ from glance.common import utils
 from glance.common import wsgi
 from glance import notifier
 from glance.openstack.common import cfg
+import glance.openstack.common.log as logging
 from glance import registry
 from glance.store import (create_stores,
                           get_from_backend,

glance/api/v1/members.py

@@ -15,13 +15,12 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import logging
-
 import webob.exc
 
 from glance.common import exception
 from glance.common import utils
 from glance.common import wsgi
+import glance.openstack.common.log as logging
 from glance import registry
 
 

glance/api/v2/images.py

@@ -16,7 +16,6 @@
 import copy
 import datetime
 import json
-import logging
 import urllib
 
 import webob.exc
@@ -26,6 +25,7 @@ from glance.common import utils
 from glance.common import wsgi
 import glance.db
 from glance.openstack.common import cfg
+import glance.openstack.common.log as logging
 from glance.openstack.common import timeutils
 import glance.schema
 

glance/common/auth.py

@@ -31,12 +31,12 @@ Keystone (an identity management system).
     http://service_endpoint/
 """
 import json
-import logging
 import urlparse
 
 import httplib2
 
 from glance.common import exception
+import glance.openstack.common.log as logging
 
 
 LOG = logging.getLogger(__name__)

glance/common/client.py

@@ -23,7 +23,6 @@ import collections
 import errno
 import functools
 import httplib
-import logging
 import os
 import re
 import select
@@ -44,6 +43,7 @@ except ImportError:
 
 from glance.common import auth
 from glance.common import exception, utils
+import glance.openstack.common.log as logging
 
 LOG = logging.getLogger(__name__)
 

glance/common/utils.py

@@ -28,7 +28,6 @@ except ImportError:
     from time import sleep
 
 import functools
-import logging
 import os
 import platform
 import subprocess
@@ -39,6 +38,7 @@ import iso8601
 from webob import exc
 
 from glance.common import exception
+import glance.openstack.common.log as logging
 
 
 LOG = logging.getLogger(__name__)

glance/common/wsgi.py

@@ -42,6 +42,7 @@ import webob.exc
 from glance.common import exception
 from glance.common import utils
 from glance.openstack.common import cfg
+import glance.openstack.common.log as os_logging
 
 
 bind_opts = [
@@ -168,7 +169,7 @@ class Server(object):
         self.application = application
         self.sock = get_socket(default_port)
 
-        self.logger = logging.getLogger('eventlet.wsgi.server')
+        self.logger = os_logging.getLogger('eventlet.wsgi.server')
 
         if CONF.workers == 0:
             # Useful for profiling, test, debug etc.

glance/db/simple/api.py

@@ -15,10 +15,10 @@
 
 import datetime
 import functools
-import logging
 import uuid
 
 from glance.common import exception
+import glance.openstack.common.log as logging
 
 
 LOG = logging.getLogger(__name__)

glance/db/sqlalchemy/api.py

@@ -33,6 +33,7 @@ from glance.common import exception
 from glance.db.sqlalchemy import migration
 from glance.db.sqlalchemy import models
 from glance.openstack.common import cfg
+import glance.openstack.common.log as os_logging
 from glance.openstack.common import timeutils
 
 
@@ -42,7 +43,7 @@ _MAX_RETRIES = None
 _RETRY_INTERVAL = None
 BASE = models.BASE
 sa_logger = None
-LOG = logging.getLogger(__name__)
+LOG = os_logging.getLogger(__name__)
 
 
 CONTAINER_FORMATS = ['ami', 'ari', 'aki', 'bare', 'ovf']

glance/db/sqlalchemy/migrate_repo/schema.py

@@ -19,10 +19,10 @@
 Various conveniences used for migration scripts
 """
 
-import logging
-
 import sqlalchemy.types
 
+import glance.openstack.common.log as logging
+
 
 LOG = logging.getLogger(__name__)
 

glance/db/sqlalchemy/migrate_repo/versions/015_quote_swift_credentials.py

@@ -15,13 +15,13 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import logging
 import types
 import urlparse
 
 import sqlalchemy
 
 from glance.common import exception
+import glance.openstack.common.log as logging
 import glance.store.swift
 
 LOG = logging.getLogger(__name__)

glance/db/sqlalchemy/migration.py

@@ -15,7 +15,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import logging
 import os
 
 from migrate.versioning import api as versioning_api
@@ -29,6 +28,7 @@ from migrate.versioning import repository as versioning_repository
 
 from glance.common import exception
 from glance.openstack.common import cfg
+import glance.openstack.common.log as logging
 
 LOG = logging.getLogger(__name__)
 

glance/image_cache/__init__.py

@@ -19,11 +19,10 @@
 LRU Cache for Image Data
 """
 
-import logging
-
 from glance.common import exception
 from glance.common import utils
 from glance.openstack.common import cfg
+import glance.openstack.common.log as logging
 from glance.openstack.common import importutils
 
 LOG = logging.getLogger(__name__)

glance/image_cache/drivers/base.py

@@ -19,12 +19,12 @@
 Base attribute driver class
 """
 
-import logging
 import os.path
 
 from glance.common import exception
 from glance.common import utils
 from glance.openstack.common import cfg
+import glance.openstack.common.log as logging
 
 LOG = logging.getLogger(__name__)
 

glance/image_cache/drivers/sqlite.py

@@ -21,7 +21,6 @@ Cache driver that uses SQLite to store information about cached images
 
 from __future__ import absolute_import
 from contextlib import contextmanager
-import logging
 import os
 import stat
 import time
@@ -32,6 +31,7 @@ import sqlite3
 from glance.common import exception
 from glance.image_cache.drivers import base
 from glance.openstack.common import cfg
+import glance.openstack.common.log as logging
 
 LOG = logging.getLogger(__name__)
 

glance/image_cache/drivers/xattr.py

@@ -57,7 +57,6 @@ from __future__ import absolute_import
 from contextlib import contextmanager
 import datetime
 import errno
-import logging
 import os
 import stat
 import time
@@ -67,6 +66,7 @@ import xattr
 from glance.common import exception
 from glance.image_cache.drivers import base
 from glance.openstack.common import cfg
+import glance.openstack.common.log as logging
 
 LOG = logging.getLogger(__name__)
 

glance/image_cache/prefetcher.py

@@ -19,13 +19,12 @@
 Prefetches images into the Image Cache
 """
 
-import logging
-
 import eventlet
 
 from glance.common import exception
 from glance import context
 from glance.image_cache import base
+import glance.openstack.common.log as logging
 from glance import registry
 import glance.store
 import glance.store.filesystem

glance/notifier/__init__.py

@@ -16,13 +16,13 @@
 #    under the License.
 
 
-import logging
 import socket
 import uuid
 
 from glance.common import exception
 from glance.openstack.common import cfg
 from glance.openstack.common import importutils
+import glance.openstack.common.log as logging
 from glance.openstack.common import timeutils
 
 notifier_opts = [

glance/notifier/notify_kombu.py

@@ -15,7 +15,6 @@
 
 
 import json
-import logging
 import time
 
 import kombu.connection
@@ -23,6 +22,7 @@ import kombu.entity
 
 from glance.notifier import strategy
 from glance.openstack.common import cfg
+import glance.openstack.common.log as logging
 
 LOG = logging.getLogger(__name__)
 

glance/notifier/notify_log.py

@@ -14,10 +14,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-
-import logging
-
 from glance.notifier import strategy
+import glance.openstack.common.log as logging
 
 
 class LoggingStrategy(strategy.Strategy):

glance/notifier/notify_qpid.py

@@ -15,12 +15,12 @@
 
 
 import json
-import logging
 
 import qpid.messaging
 
 from glance.notifier import strategy
 from glance.openstack.common import cfg
+import glance.openstack.common.log as logging
 
 LOG = logging.getLogger(__name__)
 

glance/registry/__init__.py

@@ -19,11 +19,11 @@
 Registry API
 """
 
-import logging
 import os
 
 from glance.common import exception
 from glance.openstack.common import cfg
+import glance.openstack.common.log as logging
 from glance.registry import client
 
 LOG = logging.getLogger(__name__)

glance/registry/api/v1/images.py

@@ -19,8 +19,6 @@
 Reference implementation registry server WSGI controller
 """
 
-import logging
-
 from webob import exc
 
 from glance.common import exception
@@ -28,6 +26,7 @@ from glance.common import utils
 from glance.common import wsgi
 import glance.db
 from glance.openstack.common import cfg
+import glance.openstack.common.log as logging
 from glance.openstack.common import timeutils
 
 

glance/registry/api/v1/members.py

@@ -15,14 +15,13 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import logging
-
 import webob.exc
 
 from glance.common import exception
 from glance.common import utils
 from glance.common import wsgi
 import glance.db
+import glance.openstack.common.log as logging
 
 
 LOG = logging.getLogger(__name__)

glance/store/__init__.py

@@ -15,7 +15,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import logging
 import os
 import sys
 import time
@@ -24,6 +23,7 @@ from glance.common import exception
 from glance.common import utils
 from glance.openstack.common import cfg
 from glance.openstack.common import importutils
+import glance.openstack.common.log as logging
 from glance import registry
 from glance.store import location
 

glance/store/base.py

@@ -17,10 +17,9 @@
 
 """Base class for all storage backends"""
 
-import logging
-
 from glance.common import exception
 from glance.openstack.common import importutils
+import glance.openstack.common.log as logging
 
 LOG = logging.getLogger(__name__)
 

glance/store/filesystem.py

@@ -21,13 +21,13 @@ A simple filesystem-backed store
 
 import errno
 import hashlib
-import logging
 import os
 import urlparse
 
 from glance.common import exception
 from glance.common import utils
 from glance.openstack.common import cfg
+import glance.openstack.common.log as logging
 import glance.store
 import glance.store.base
 import glance.store.location

glance/store/http.py

@@ -16,10 +16,10 @@
 #    under the License.
 
 import httplib
-import logging
 import urlparse
 
 from glance.common import exception
+import glance.openstack.common.log as logging
 import glance.store.base
 import glance.store.location
 

glance/store/location.py

@@ -39,11 +39,11 @@ that it stores in its storage backends. It **does contain** security
 credentials and is **not** user-facing.
 """
 
-import logging
 import urlparse
 
 from glance.common import exception
 from glance.common import utils
+import glance.openstack.common.log as logging
 
 LOG = logging.getLogger(__name__)
 

glance/store/rbd.py

@@ -21,11 +21,11 @@ from __future__ import absolute_import
 from __future__ import with_statement
 
 import hashlib
-import logging
 import math
 
 from glance.common import exception
 from glance.openstack.common import cfg
+import glance.openstack.common.log as logging
 import glance.store
 import glance.store.base
 import glance.store.location

glance/store/s3.py

@@ -19,7 +19,6 @@
 
 import hashlib
 import httplib
-import logging
 import re
 import tempfile
 import urlparse
@@ -27,6 +26,7 @@ import urlparse
 from glance.common import exception
 from glance.common import utils
 from glance.openstack.common import cfg
+import glance.openstack.common.log as logging
 import glance.store
 import glance.store.base
 import glance.store.location

glance/store/scrubber.py

@@ -17,12 +17,12 @@
 
 import calendar
 import eventlet
-import logging
 import os
 import time
 
 from glance.common import utils
 from glance.openstack.common import cfg
+import glance.openstack.common.log as logging
 from glance import registry
 from glance.registry import client
 from glance import store

glance/store/swift.py

@@ -21,13 +21,13 @@ from __future__ import absolute_import
 
 import hashlib
 import httplib
-import logging
 import math
 import urllib
 import urlparse
 
 from glance.common import exception
 from glance.openstack.common import cfg
+import glance.openstack.common.log as logging
 import glance.store
 import glance.store.base
 import glance.store.location

glance/tests/unit/test_notifier.py

@@ -15,8 +15,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import logging
-
 import kombu.entity
 import mox
 try:
@@ -30,6 +28,7 @@ from glance.common import exception
 from glance import notifier
 import glance.notifier.notify_kombu
 from glance.openstack.common import importutils
+import glance.openstack.common.log as logging
 from glance.tests import utils
 
 

glance/tests/unit/utils.py

@@ -13,12 +13,11 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import logging
-
 from glance.common import exception
 from glance.common import wsgi
 import glance.context
 import glance.db.simple.api as simple_db
+import glance.openstack.common.log as logging
 
 
 LOG = logging.getLogger(__name__)

tools/migrate_image_owners.py

@@ -1,12 +1,12 @@
 #!/usr/bin/python
 
-import logging
 import sys
 
 import keystoneclient.v2_0.client
 
 import glance.context
 from glance.openstack.common import cfg
+import glance.openstack.common.log as logging
 import glance.registry.context
 import glance.db.sqlalchemy.api as db_api