Merge "Don't create LOG if not logging"
This commit is contained in:
commit
60e78e48e6
|
@ -13,7 +13,6 @@
|
||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
from oslo_log import log as logging
|
|
||||||
from oslo_utils import strutils
|
from oslo_utils import strutils
|
||||||
import webob
|
import webob
|
||||||
|
|
||||||
|
@ -29,8 +28,6 @@ from cinder import quota
|
||||||
from cinder import quota_utils
|
from cinder import quota_utils
|
||||||
from cinder import utils
|
from cinder import utils
|
||||||
|
|
||||||
LOG = logging.getLogger(__name__)
|
|
||||||
|
|
||||||
QUOTAS = quota.QUOTAS
|
QUOTAS = quota.QUOTAS
|
||||||
GROUP_QUOTAS = quota.GROUP_QUOTAS
|
GROUP_QUOTAS = quota.GROUP_QUOTAS
|
||||||
NON_QUOTA_KEYS = quota.NON_QUOTA_KEYS
|
NON_QUOTA_KEYS = quota.NON_QUOTA_KEYS
|
||||||
|
|
|
@ -14,14 +14,11 @@
|
||||||
import abc
|
import abc
|
||||||
|
|
||||||
from oslo_config import cfg
|
from oslo_config import cfg
|
||||||
from oslo_log import log as logging
|
|
||||||
from oslo_utils import importutils
|
from oslo_utils import importutils
|
||||||
|
|
||||||
from cinder import exception
|
from cinder import exception
|
||||||
from cinder.i18n import _
|
from cinder.i18n import _
|
||||||
|
|
||||||
LOG = logging.getLogger(__name__)
|
|
||||||
|
|
||||||
CONF = cfg.CONF
|
CONF = cfg.CONF
|
||||||
|
|
||||||
# NOTE(ZhengMa): The order of the option is improtant, accelerators
|
# NOTE(ZhengMa): The order of the option is improtant, accelerators
|
||||||
|
|
|
@ -20,7 +20,6 @@ import json
|
||||||
import socket
|
import socket
|
||||||
|
|
||||||
from oslo_config import cfg
|
from oslo_config import cfg
|
||||||
from oslo_log import log
|
|
||||||
|
|
||||||
from cinder import exception
|
from cinder import exception
|
||||||
from cinder.i18n import _
|
from cinder.i18n import _
|
||||||
|
@ -30,7 +29,6 @@ from cinder.volume import driver
|
||||||
from cinder.volume.drivers.netapp.dataontap.client import client_cmode
|
from cinder.volume.drivers.netapp.dataontap.client import client_cmode
|
||||||
from cinder.volume.drivers.netapp import options as na_opts
|
from cinder.volume.drivers.netapp import options as na_opts
|
||||||
|
|
||||||
LOG = log.getLogger(__name__)
|
|
||||||
CONF = cfg.CONF
|
CONF = cfg.CONF
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue