Use openstack common log to do logging.

Bug #1073194

We use openstack common log to do logging. At the same time, we will use
quantum logger as our top logger, so that all sub loggers will be set
according to quantum.conf

Change-Id: I5adf72e6031ad437e05c3521864a83757b3e7887

diff --git a/etc/quantum.conf b/etc/quantum.conf
index 8cb9f8143946793fb69d51dc20b5d5fc6fe0bf9e..e767102ef21f4fdbef4d24060e0510a402d671dd 100644 (file)
--- a/etc/quantum.conf
+++ b/etc/quantum.conf
@@ -1,23 +1,29 @@
 [DEFAULT]
-# Default log level is WARNING
-# Show debugging output in logs (sets DEBUG log level output)
+# Default log level is INFO
+# verbose and debug has the same result.
+# One of them will set DEBUG log level output
 # debug = False
-
-# Show more verbose log output (sets INFO log level output) if debug is False
 # verbose = False
 
 # log_format = %(asctime)s %(levelname)8s [%(name)s] %(message)s
 # log_date_format = %Y-%m-%d %H:%M:%S
 
+# use_syslog                           -> syslog
+# log_file and log_dir                 -> log_dir/log_file
+# (not log_file) and log_dir           -> log_dir/{binary_name}.log
+# use_stderr                           -> stderr
+# (not user_stderr) and (not log_file) -> stdout
+# publish_errors                       -> notification system
+
 # use_syslog = False
 # syslog_log_facility = LOG_USER
 
-# if use_syslog is False, we can set log_file and log_dir.
-# if use_syslog is False and we do not set log_file,
-# the log will be printed to stdout.
+# use_stderr = True
 # log_file =
 # log_dir =
 
+# publish_errors = False
+
 # Address to bind the API server
 bind_host = 0.0.0.0
 

diff --git a/quantum/agent/dhcp_agent.py b/quantum/agent/dhcp_agent.py
index 044d7246f28183c997cdfac07f54dee2a285a2ed..b4e6e6dcc16f0027983061c05ee626d1533f2e56 100644 (file)
--- a/quantum/agent/dhcp_agent.py
+++ b/quantum/agent/dhcp_agent.py
@@ -15,7 +15,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import logging
 import os
 import re
 import socket
@@ -37,6 +36,7 @@ from quantum.openstack.common import cfg
 from quantum.openstack.common import context
 from quantum.openstack.common import importutils
 from quantum.openstack.common import jsonutils
+from quantum.openstack.common import log as logging
 from quantum.openstack.common.rpc import proxy
 
 LOG = logging.getLogger(__name__)

diff --git a/quantum/agent/l3_agent.py b/quantum/agent/l3_agent.py
index 26a56fc71f3eb49cb238eb9737f467b67b470768..3707e9162e8da5626eef90f7e0b3cf7b1849c019 100644 (file)
--- a/quantum/agent/l3_agent.py
+++ b/quantum/agent/l3_agent.py
@@ -19,7 +19,6 @@
 #
 """
 
-import logging
 import sys
 import time
 
@@ -33,6 +32,7 @@ from quantum.agent.linux import utils
 from quantum.db import l3_db
 from quantum.openstack.common import cfg
 from quantum.openstack.common import importutils
+from quantum.openstack.common import log as logging
 from quantumclient.v2_0 import client
 
 LOG = logging.getLogger(__name__)

diff --git a/quantum/agent/linux/dhcp.py b/quantum/agent/linux/dhcp.py
index c591e386253a5b8781facfbf34b43c4df10912c4..304e2ce4594df2306879b7ddfc2e21c4554cdc9b 100644 (file)
--- a/quantum/agent/linux/dhcp.py
+++ b/quantum/agent/linux/dhcp.py
@@ -16,7 +16,6 @@
 #    under the License.
 
 import abc
-import logging
 import os
 import re
 import socket
@@ -30,6 +29,7 @@ from quantum.agent.linux import ip_lib
 from quantum.agent.linux import utils
 from quantum.openstack.common import cfg
 from quantum.openstack.common import jsonutils
+from quantum.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 

diff --git a/quantum/agent/linux/interface.py b/quantum/agent/linux/interface.py
index b3b5a8ac6abc421bcd4da6dc6b5ada1c2db8bad7..a8e9dd738451b2a65c61eac73a24fba68c996bdb 100644 (file)
--- a/quantum/agent/linux/interface.py
+++ b/quantum/agent/linux/interface.py
@@ -16,7 +16,6 @@
 #    under the License.
 
 import abc
-import logging
 
 import netaddr
 
@@ -27,6 +26,7 @@ from quantum.common import exceptions
 from quantum.extensions.flavor import (FLAVOR_NETWORK)
 from quantum.openstack.common import cfg
 from quantum.openstack.common import importutils
+from quantum.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 

diff --git a/quantum/agent/linux/iptables_manager.py b/quantum/agent/linux/iptables_manager.py
index 83b4d8af2d63949f9c744050619a92989fe103f4..5201820f030b9c1f035bd3b952535a95ad0ebfdf 100644 (file)
--- a/quantum/agent/linux/iptables_manager.py
+++ b/quantum/agent/linux/iptables_manager.py
@@ -22,10 +22,10 @@
 """Implements iptables rules using linux utilities."""
 
 import inspect
-import logging
 import os
 
 from quantum.agent.linux import utils
+from quantum.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 # NOTE(vish): Iptables supports chain names of up to 28 characters,  and we

diff --git a/quantum/agent/linux/ovs_lib.py b/quantum/agent/linux/ovs_lib.py
index 9eaa67e30f0cf39addf9a055b09c39fc8726877e..65d840e413aaf9e6890022a0049f679af86ecf56 100644 (file)
--- a/quantum/agent/linux/ovs_lib.py
+++ b/quantum/agent/linux/ovs_lib.py
@@ -18,10 +18,10 @@
 # @author: Dan Wendlandt, Nicira Networks, Inc.
 # @author: Dave Lapsley, Nicira Networks, Inc.
 
-import logging
 import re
 
 from quantum.agent.linux import utils
+from quantum.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 

diff --git a/quantum/agent/linux/utils.py b/quantum/agent/linux/utils.py
index 0d11aa0c07f5eb3713de05034b3fa35d8ae82322..8f627530366216a92de62e10d2a24d8408ca4531 100644 (file)
--- a/quantum/agent/linux/utils.py
+++ b/quantum/agent/linux/utils.py
@@ -18,7 +18,6 @@
 # @author: Juliano Martinez, Locaweb.
 
 import fcntl
-import logging
 import os
 import shlex
 import signal
@@ -28,7 +27,7 @@ import struct
 from eventlet.green import subprocess
 
 from quantum.common import utils
-
+from quantum.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 

diff --git a/quantum/agent/netns_cleanup_util.py b/quantum/agent/netns_cleanup_util.py
index 3b479d76da99ede1cba50a666a38029657de55c7..7271968b3c0ed00ddc1d266d3e8357e4bafabb74 100644 (file)
--- a/quantum/agent/netns_cleanup_util.py
+++ b/quantum/agent/netns_cleanup_util.py
@@ -1,4 +1,3 @@
-import logging
 import re
 import sys
 
@@ -13,6 +12,7 @@ from quantum.api.v2 import attributes
 from quantum.common import config
 from quantum.openstack.common import cfg
 from quantum.openstack.common import importutils
+from quantum.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 NS_MANGLING_PATTERN = ('(%s|%s)' % (dhcp_agent.NS_PREFIX, l3_agent.NS_PREFIX) +

diff --git a/quantum/agent/rpc.py b/quantum/agent/rpc.py
index ff7aa50498ab27d062d4e34d0489dd3c36b1d64d..720bb54761437812fe28c7045a9f6dfcfd7a2aad 100644 (file)
--- a/quantum/agent/rpc.py
+++ b/quantum/agent/rpc.py
@@ -13,12 +13,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import logging
-
 import eventlet
 
 from quantum.common import topics
 
+from quantum.openstack.common import log as logging
 from quantum.openstack.common import rpc
 from quantum.openstack.common.rpc import proxy
 from quantum.openstack.common.notifier import api

diff --git a/quantum/api/api_common.py b/quantum/api/api_common.py
index 8ea128c9db8fc899fb0b7d83586ff5a0013fa8b1..e9bb12fcfa9241a41f8cc0da19d64ee09f9bd322 100644 (file)
--- a/quantum/api/api_common.py
+++ b/quantum/api/api_common.py
@@ -15,10 +15,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import logging
 
 from webob import exc
 
+from quantum.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 

diff --git a/quantum/api/v2/attributes.py b/quantum/api/v2/attributes.py
index 205e7cc47e2d3941b42281e751ec20b28efe5682..306df78ca6607a9c41d3dafe1f650ce1fb78c2f8 100644 (file)
--- a/quantum/api/v2/attributes.py
+++ b/quantum/api/v2/attributes.py
@@ -17,12 +17,11 @@ ATTR_NOT_SPECIFIED = object()
 # Defining a constant to avoid repeating string literal in several modules
 SHARED = 'shared'
 
-import logging
 import netaddr
 import re
 
 from quantum.common import exceptions as q_exc
-
+from quantum.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 

diff --git a/quantum/api/v2/base.py b/quantum/api/v2/base.py
index d6b832356cdb82f37496e147cca7b64bb789bd96..0adcf0907e7b7d98efb8a582d3231608796605b2 100644 (file)
--- a/quantum/api/v2/base.py
+++ b/quantum/api/v2/base.py
@@ -13,7 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import logging
 import socket
 
 import webob.exc
@@ -22,6 +21,7 @@ from quantum.api.v2 import attributes
 from quantum.api.v2 import resource as wsgi_resource
 from quantum.common import exceptions
 from quantum.openstack.common import cfg
+from quantum.openstack.common import log as logging
 from quantum.openstack.common.notifier import api as notifier_api
 from quantum import policy
 from quantum import quota

diff --git a/quantum/api/v2/resource.py b/quantum/api/v2/resource.py
index 560ac52e9db341738280760e8e2a39a7c0eb9fe8..367edae7514666aee240e4fbc4fed476d073145d 100644 (file)
--- a/quantum/api/v2/resource.py
+++ b/quantum/api/v2/resource.py
@@ -16,7 +16,6 @@
 """
 Utility methods for working with WSGI servers redux
 """
-import logging
 
 import webob
 import webob.dec
@@ -25,6 +24,7 @@ import webob.exc
 from quantum.common import exceptions
 from quantum import context
 from quantum.openstack.common import jsonutils as json
+from quantum.openstack.common import log as logging
 from quantum import wsgi
 
 

diff --git a/quantum/api/v2/router.py b/quantum/api/v2/router.py
index dcd719373dc366803fdfeade9b0cce76a227ccc7..ca561d01fab5b16ab856cb0304da68d9be4df39f 100644 (file)
--- a/quantum/api/v2/router.py
+++ b/quantum/api/v2/router.py
@@ -13,7 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import logging
 import urlparse
 
 import routes as routes_mapper
@@ -26,6 +25,7 @@ from quantum.api.v2 import base
 from quantum.extensions import extensions
 from quantum import manager
 from quantum.openstack.common import cfg
+from quantum.openstack.common import log as logging
 from quantum import wsgi
 
 

diff --git a/quantum/api/versions.py b/quantum/api/versions.py
index 0e4c09362637d5f4cd1f789144a8490b1b3ead91..9287d04a54c48f260f5bcfdf00f4288cc7428f23 100644 (file)
--- a/quantum/api/versions.py
+++ b/quantum/api/versions.py
@@ -15,10 +15,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import logging
 import webob.dec
 
 from quantum.api.views import versions as versions_view
+from quantum.openstack.common import log as logging
 from quantum import wsgi
 
 

diff --git a/quantum/auth.py b/quantum/auth.py
index 4492dcdc45e6a7da7befbe657db86ac8eae95add..3cdb3d93e10e2ab3b115eb1ada325f0003e4490a 100644 (file)
--- a/quantum/auth.py
+++ b/quantum/auth.py
@@ -14,15 +14,13 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import logging
-
 import webob.dec
 import webob.exc
 
 from quantum import context
 from quantum import wsgi
 from quantum.openstack.common import cfg
-
+from quantum.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 

diff --git a/quantum/common/config.py b/quantum/common/config.py
index 405a9023b5c72275f0e2ffec8e6f1596d3c7b83a..d78a3b641099609e3b53d58321fb994affa6c1a8 100644 (file)
--- a/quantum/common/config.py
+++ b/quantum/common/config.py
@@ -19,9 +19,6 @@
 Routines for configuring Quantum
 """
 
-import logging
-import logging.config
-import logging.handlers
 import os
 import sys
 
@@ -29,9 +26,9 @@ from paste import deploy
 
 from quantum.api.v2 import attributes
 from quantum.openstack.common import cfg
+from quantum.openstack.common import log as logging
 from quantum.version import version_string
 
-
 LOG = logging.getLogger(__name__)
 
 core_opts = [
@@ -79,45 +76,10 @@ def setup_logging(conf):
 
     :param conf: a cfg.ConfOpts object
     """
-
-    if conf.log_config:
-        # Use a logging configuration file for all settings...
-        if os.path.exists(conf.log_config):
-            logging.config.fileConfig(conf.log_config)
-            return
-        else:
-            raise RuntimeError("Unable to locate specified logging "
-                               "config file: %s" % conf.log_config)
-
-    root_logger = logging.root
-    if conf.debug:
-        root_logger.setLevel(logging.DEBUG)
-    elif conf.verbose:
-        root_logger.setLevel(logging.INFO)
-    else:
-        root_logger.setLevel(logging.WARNING)
-
-    formatter = logging.Formatter(conf.log_format, conf.log_date_format)
-
-    if conf.use_syslog:
-        try:
-            facility = getattr(logging.handlers.SysLogHandler,
-                               conf.syslog_log_facility)
-        except AttributeError:
-            raise ValueError(_("Invalid syslog facility"))
-
-        handler = logging.handlers.SysLogHandler(address='/dev/log',
-                                                 facility=facility)
-    elif conf.log_file:
-        logfile = conf.log_file
-        if conf.log_dir:
-            logfile = os.path.join(conf.log_dir, logfile)
-        handler = logging.handlers.WatchedFileHandler(logfile)
-    else:
-        handler = logging.StreamHandler(sys.stdout)
-
-    handler.setFormatter(formatter)
-    root_logger.addHandler(handler)
+    product_name = "quantum"
+    logging.setup(product_name)
+    log_root = logging.getLogger(product_name).logger
+    log_root.propagate = 0
     LOG.info("Logging enabled!")
 
 

diff --git a/quantum/common/utils.py b/quantum/common/utils.py
index f57fafca8434703787cee04cc3b3fa164932fb7a..8b9015cf5f6ed77911998f9370b7e57389fb1494 100644 (file)
--- a/quantum/common/utils.py
+++ b/quantum/common/utils.py
@@ -21,7 +21,6 @@
 """Utilities and helper functions."""
 
 
-import logging
 import os
 import signal
 import uuid
@@ -29,8 +28,10 @@ import uuid
 from eventlet.green import subprocess
 
 from quantum.openstack.common import cfg
+from quantum.openstack.common import log as logging
 
 TIME_FORMAT = "%Y-%m-%dT%H:%M:%SZ"
+LOG = logging.getLogger(__name__)
 
 
 def boolize(subject):
@@ -60,7 +61,7 @@ def read_cached_file(filename, cache_info, reload_func=None):
     """
     mtime = os.path.getmtime(filename)
     if not cache_info or mtime != cache_info.get('mtime'):
-        logging.debug(_("Reloading cached file %s") % filename)
+        LOG.debug(_("Reloading cached file %s") % filename)
         with open(filename) as fap:
             cache_info['data'] = fap.read()
         cache_info['mtime'] = mtime

diff --git a/quantum/context.py b/quantum/context.py
index c2555f5232fce4bca208e5005f5324d7e01dd0b8..0013c9f43679ba2d2915720cee907d7bab472e2b 100644 (file)
--- a/quantum/context.py
+++ b/quantum/context.py
@@ -18,12 +18,14 @@
 """Context: context for security/db session."""
 
 import copy
-import logging
 
 from datetime import datetime
 
 from quantum.db import api as db_api
 from quantum.openstack.common import context as common_context
+from quantum.openstack.common import log as logging
+
+
 LOG = logging.getLogger(__name__)
 
 

diff --git a/quantum/db/api.py b/quantum/db/api.py
index a5f5cc99e20b5007ee3d8f61f7988b713fc53561..4c0de4cdbff94f1f64648d432c94444bba16ba6f 100644 (file)
--- a/quantum/db/api.py
+++ b/quantum/db/api.py
@@ -17,7 +17,6 @@
 # @author: Brad Hall, Nicira Networks, Inc.
 # @author: Dan Wendlandt, Nicira Networks, Inc.
 
-import logging
 import time
 
 import sqlalchemy as sql
@@ -26,6 +25,7 @@ from sqlalchemy.exc import DisconnectionError
 from sqlalchemy.orm import sessionmaker, exc
 
 from quantum.db import model_base
+from quantum.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 

diff --git a/quantum/db/db_base_plugin_v2.py b/quantum/db/db_base_plugin_v2.py
index 36da230afa819acab1707e47defcb1776aab4719..705bb138a41f8da285ab3d05824a43569b8bdcf0 100644 (file)
--- a/quantum/db/db_base_plugin_v2.py
+++ b/quantum/db/db_base_plugin_v2.py
@@ -14,7 +14,6 @@
 # limitations under the License.
 
 import datetime
-import logging
 import random
 
 import netaddr
@@ -28,6 +27,7 @@ from quantum.common import utils
 from quantum.db import api as db
 from quantum.db import models_v2
 from quantum.openstack.common import cfg
+from quantum.openstack.common import log as logging
 from quantum.openstack.common import timeutils
 from quantum import quantum_plugin_base_v2
 

diff --git a/quantum/db/dhcp_rpc_base.py b/quantum/db/dhcp_rpc_base.py
index 42bee7812f2e934a9f60b03087b48954138b1922..0fa7000b203fa0ee585a3bdc55e0ff1be688e4d7 100644 (file)
--- a/quantum/db/dhcp_rpc_base.py
+++ b/quantum/db/dhcp_rpc_base.py
@@ -13,14 +13,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import logging
-
 from sqlalchemy.orm import exc
 
 from quantum import context as quantum_context
 from quantum import manager
 from quantum.api.v2 import attributes
 from quantum.openstack.common import context
+from quantum.openstack.common import log as logging
 
 
 LOG = logging.getLogger(__name__)

diff --git a/quantum/db/l3_db.py b/quantum/db/l3_db.py
index 8b78bf1e2c358e1fec248df4899e8c059b6707a6..8c4d79848fbcd9fcf1ea9291ab3652d5ffc83822 100644 (file)
--- a/quantum/db/l3_db.py
+++ b/quantum/db/l3_db.py
@@ -19,8 +19,6 @@
 #
 """
 
-import logging
-
 import netaddr
 import sqlalchemy as sa
 from sqlalchemy import orm
@@ -36,6 +34,8 @@ from quantum.db import model_base
 from quantum.db import models_v2
 from quantum.extensions import l3
 from quantum.openstack.common import cfg
+from quantum.openstack.common import log as logging
+
 from quantum import policy
 
 

diff --git a/quantum/extensions/extensions.py b/quantum/extensions/extensions.py
index 26ff3222b1c059db5358059adf20890f09756d89..655f3c45eda0fb5c022cfe496d5cc022f2397aed 100644 (file)
--- a/quantum/extensions/extensions.py
+++ b/quantum/extensions/extensions.py
@@ -19,7 +19,6 @@
 
 from abc import ABCMeta
 import imp
-import logging
 import os
 
 import routes
@@ -31,6 +30,7 @@ import quantum.extensions
 from quantum.manager import QuantumManager
 from quantum.openstack.common import cfg
 from quantum.openstack.common import importutils
+from quantum.openstack.common import log as logging
 from quantum import wsgi
 
 

diff --git a/quantum/extensions/flavor.py b/quantum/extensions/flavor.py
index f3940f5262b944266709fcd25bdc2290c338fcd7..7b48d462eb8b9a2bab54c5a105e91563fc8871d3 100644 (file)
--- a/quantum/extensions/flavor.py
+++ b/quantum/extensions/flavor.py
@@ -15,9 +15,8 @@
 #    under the License.
 #
 
-import logging
-
 from quantum.api.v2 import attributes
+from quantum.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 

diff --git a/quantum/manager.py b/quantum/manager.py
index 77ab57a9aae6cc5df6df28376f039b55bacea75b..bb4981a86b203dfa7ba5a4fe72c9ff6327835356 100644 (file)
--- a/quantum/manager.py
+++ b/quantum/manager.py
@@ -23,11 +23,10 @@ class.
 The caller should make sure that QuantumManager is a singleton.
 """
 
-import logging
-
 from quantum.common.exceptions import ClassNotFound
 from quantum.openstack.common import cfg
 from quantum.openstack.common import importutils
+from quantum.openstack.common import log as logging
 
 
 LOG = logging.getLogger(__name__)

diff --git a/quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py b/quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py
index 6ff3ee68fdd70233f026d71ccc04d99bb9f0ee1b..1d3fb55fac3b7f7e9232b35f32ad2aaf6cf5d138 100755 (executable)
--- a/quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py
+++ b/quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py
@@ -22,7 +22,6 @@
 # Quantum OpenVSwitch Plugin.
 # @author: Sumit Naiksatam, Cisco Systems, Inc.
 
-import logging
 import os
 import sys
 import time
@@ -38,12 +37,13 @@ from quantum.common import constants
 from quantum.common import topics
 from quantum.openstack.common import cfg
 from quantum.openstack.common import context
+from quantum.openstack.common import log as logging
 from quantum.openstack.common import rpc
 from quantum.openstack.common.rpc import dispatcher
 from quantum.plugins.linuxbridge.common import config
 from quantum.plugins.linuxbridge.common import constants as lconst
 
-logging.basicConfig()
+
 LOG = logging.getLogger(__name__)
 
 BRIDGE_NAME_PREFIX = "brq"

diff --git a/quantum/plugins/linuxbridge/db/l2network_db_v2.py b/quantum/plugins/linuxbridge/db/l2network_db_v2.py
index 0a671852d0928bc285dca439b4b00219b186eb5a..dee651e437e72e3cd99be19c8c7ad313761de4e4 100644 (file)
--- a/quantum/plugins/linuxbridge/db/l2network_db_v2.py
+++ b/quantum/plugins/linuxbridge/db/l2network_db_v2.py
@@ -13,7 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import logging
 
 from sqlalchemy.orm import exc
 
@@ -21,6 +20,7 @@ from quantum.common import exceptions as q_exc
 import quantum.db.api as db
 from quantum.db import models_v2
 from quantum.openstack.common import cfg
+from quantum.openstack.common import log as logging
 from quantum.plugins.linuxbridge.common import config
 from quantum.plugins.linuxbridge.common import constants
 from quantum.plugins.linuxbridge.db import l2network_models_v2

diff --git a/quantum/plugins/linuxbridge/lb_quantum_plugin.py b/quantum/plugins/linuxbridge/lb_quantum_plugin.py
index 49a1ec10dee2122ba44b229bcad1b2b79d0733ef..173f2e6fd733e8fa5b2b261fbdc228a31797c5be 100644 (file)
--- a/quantum/plugins/linuxbridge/lb_quantum_plugin.py
+++ b/quantum/plugins/linuxbridge/lb_quantum_plugin.py
@@ -13,7 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import logging
 import sys
 
 from quantum.api.v2 import attributes
@@ -28,6 +27,7 @@ from quantum.db import models_v2
 from quantum.extensions import providernet as provider
 from quantum.openstack.common import context
 from quantum.openstack.common import cfg
+from quantum.openstack.common import log as logging
 from quantum.openstack.common import rpc
 from quantum.openstack.common.rpc import dispatcher
 from quantum.openstack.common.rpc import proxy

diff --git a/quantum/plugins/openvswitch/agent/ovs_quantum_agent.py b/quantum/plugins/openvswitch/agent/ovs_quantum_agent.py
index 4f332e11db2878612e02bfbe6f3fe140dfb08a4d..2a8aa169e7c0f05356240bf570e5a54d0365e22f 100755 (executable)
--- a/quantum/plugins/openvswitch/agent/ovs_quantum_agent.py
+++ b/quantum/plugins/openvswitch/agent/ovs_quantum_agent.py
@@ -20,7 +20,6 @@
 # @author: Dave Lapsley, Nicira Networks, Inc.
 # @author: Aaron Rosen, Nicira Networks, Inc.
 
-import logging
 import sys
 import time
 
@@ -35,12 +34,13 @@ from quantum.common import config as logging_config
 from quantum.common import topics
 from quantum.openstack.common import cfg
 from quantum.openstack.common import context
+from quantum.openstack.common import log as logging
 from quantum.openstack.common import rpc
 from quantum.openstack.common.rpc import dispatcher
 from quantum.plugins.openvswitch.common import config
 from quantum.plugins.openvswitch.common import constants
 
-logging.basicConfig()
+
 LOG = logging.getLogger(__name__)
 
 # A placeholder for dead vlans.
@@ -687,8 +687,6 @@ def create_agent_config_map(config):
 def main():
     eventlet.monkey_patch()
     cfg.CONF(args=sys.argv, project='quantum')
-
-    # (TODO) gary - swap with common logging
     logging_config.setup_logging(cfg.CONF)
 
     try:

diff --git a/quantum/plugins/openvswitch/ovs_db_v2.py b/quantum/plugins/openvswitch/ovs_db_v2.py
index 5027ad3967826a9f5bad6b735c8fa00c817b37d4..5e8d567ad64f80cbbb08862724815ec9d678fc5d 100644 (file)
--- a/quantum/plugins/openvswitch/ovs_db_v2.py
+++ b/quantum/plugins/openvswitch/ovs_db_v2.py
@@ -16,14 +16,13 @@
 # @author: Aaron Rosen, Nicira Networks, Inc.
 # @author: Bob Kukura, Red Hat, Inc.
 
-import logging
-
 from sqlalchemy.orm import exc
 
 from quantum.common import exceptions as q_exc
 from quantum.db import models_v2
 import quantum.db.api as db
 from quantum.openstack.common import cfg
+from quantum.openstack.common import log as logging
 from quantum.plugins.openvswitch.common import constants
 from quantum.plugins.openvswitch import ovs_models_v2
 

diff --git a/quantum/plugins/openvswitch/ovs_quantum_plugin.py b/quantum/plugins/openvswitch/ovs_quantum_plugin.py
index 11c1569f326bf353aa76c77fbabbc25a71865495..008d81a1a0209bb952549f519976f61e706cd758 100644 (file)
--- a/quantum/plugins/openvswitch/ovs_quantum_plugin.py
+++ b/quantum/plugins/openvswitch/ovs_quantum_plugin.py
@@ -20,7 +20,6 @@
 # @author: Aaron Rosen, Nicira Networks, Inc.
 # @author: Bob Kukura, Red Hat, Inc.
 
-import logging
 import os
 import sys
 
@@ -34,6 +33,7 @@ from quantum.db import l3_db
 from quantum.extensions import providernet as provider
 from quantum.openstack.common import context
 from quantum.openstack.common import cfg
+from quantum.openstack.common import log as logging
 from quantum.openstack.common import rpc
 from quantum.openstack.common.rpc import dispatcher
 from quantum.openstack.common.rpc import proxy

diff --git a/quantum/policy.py b/quantum/policy.py
index cd1d26f24218ae9d2f8e32c31c7f6dec56cfb619..de9483eb2c73d77288f1b1b13d795842cd68f038 100644 (file)
--- a/quantum/policy.py
+++ b/quantum/policy.py
@@ -18,12 +18,12 @@
 """
 Policy engine for quantum.  Largely copied from nova.
 """
-import logging
 
 from quantum.api.v2 import attributes
 from quantum.common import exceptions
 from quantum.openstack.common import cfg
 import quantum.common.utils as utils
+from quantum.openstack.common import log as logging
 from quantum.openstack.common import policy
 
 

diff --git a/quantum/quota.py b/quantum/quota.py
index 4a00804c33f6e3dbc7dbf8648445cbb9455cc2a2..bcb498fc1650cd435cbbcc81ed647401967ce384 100644 (file)
--- a/quantum/quota.py
+++ b/quantum/quota.py
@@ -16,11 +16,10 @@
 
 """Quotas for instances, volumes, and floating ips."""
 
-import logging
-
 from quantum.common import exceptions
 from quantum.openstack.common import cfg
 from quantum.openstack.common import importutils
+from quantum.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 quota_opts = [

diff --git a/quantum/service.py b/quantum/service.py
index 48ef432e2ae732b5fea5389b6ee75bad647545e8..f4525300b7b62d2966e1a0e5ec8fab1f3f2c7ec5 100644 (file)
--- a/quantum/service.py
+++ b/quantum/service.py
@@ -15,10 +15,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import logging
-
 from quantum.common import config
 from quantum.openstack.common import cfg
+from quantum.openstack.common import log as logging
 from quantum import wsgi
 
 

diff --git a/quantum/wsgi.py b/quantum/wsgi.py
index 065d73e0b3afdda2f0ed13df990495bb7549bacd..946af82dd5a36ed81e410f1dbc9d356634e1670b 100644 (file)
--- a/quantum/wsgi.py
+++ b/quantum/wsgi.py
@@ -18,8 +18,6 @@
 """
 Utility methods for working with WSGI servers
 """
-
-import logging
 import sys
 from xml.dom import minidom
 from xml.parsers import expat
@@ -34,22 +32,11 @@ import webob.exc
 from quantum.common import exceptions as exception
 from quantum import context
 from quantum.openstack.common import jsonutils
-
+from quantum.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 
 
-class WritableLogger(object):
-    """A thin wrapper that responds to `write` and logs."""
-
-    def __init__(self, logger, level=logging.DEBUG):
-        self.logger = logger
-        self.level = level
-
-    def write(self, msg):
-        self.logger.log(self.level, msg.strip("\n"))
-
-
 def run_server(application, port):
     """Run a WSGI server with the given application."""
     sock = eventlet.listen(('0.0.0.0', port))
@@ -79,7 +66,7 @@ class Server(object):
         """Start a WSGI server in a new green thread."""
         logger = logging.getLogger('eventlet.wsgi.server')
         eventlet.wsgi.server(socket, application, custom_pool=self.pool,
-                             log=WritableLogger(logger))
+                             log=logging.WritableLogger(logger))
 
 
 class Middleware(object):