openstack/deb-cinder
Code Issues Proposed changes

Change logging level AUDIT to INFO

Browse Source 
According to the latest revision of the logging guidelines message
of type AUDIT should be moved to INFO.

The latest revision is available at https://review.openstack.org/#/c/91446/
at the moment.

Change-Id: I2d86fa634f6424b0bb862319b9ae40d3f3b1ec7a
This commit is contained in:
Christian Berendt
2014-07-01 11:34:08 +02:00
parent d189ce467e
commit 4dc37abcd5
11 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
cinder/api/contrib/backups.py
View File

@@ -174,7 +174,7 @@ class BackupsController(wsgi.Controller):
LOG.debug('delete called for member %s', id) LOG.debug('delete called for member %s', id)
context = req.environ['cinder.context'] context = req.environ['cinder.context']
LOG.audit(_('Delete backup with id: %s'), id, context=context) LOG.info(_('Delete backup with id: %s'), id, context=context)
try: try:
self.backup_api.delete(context, id) self.backup_api.delete(context, id)
@@ -247,10 +247,10 @@ class BackupsController(wsgi.Controller):
name = backup.get('name', None) name = backup.get('name', None)
description = backup.get('description', None) description = backup.get('description', None)
LOG.audit(_("Creating backup of volume %(volume_id)s in container" LOG.info(_("Creating backup of volume %(volume_id)s in container"
" %(container)s"), " %(container)s"),
{'volume_id': volume_id, 'container': container}, {'volume_id': volume_id, 'container': container},
context=context) context=context)
try: try:
new_backup = self.backup_api.create(context, name, description, new_backup = self.backup_api.create(context, name, description,
@@ -280,9 +280,9 @@ class BackupsController(wsgi.Controller):
restore = body['restore'] restore = body['restore']
volume_id = restore.get('volume_id', None) volume_id = restore.get('volume_id', None)
LOG.audit(_("Restoring backup %(backup_id)s to volume %(volume_id)s"), LOG.info(_("Restoring backup %(backup_id)s to volume %(volume_id)s"),
{'backup_id': id, 'volume_id': volume_id}, {'backup_id': id, 'volume_id': volume_id},
context=context) context=context)
try: try:
new_restore = self.backup_api.restore(context, new_restore = self.backup_api.restore(context,

4
cinder/api/contrib/hosts.py
View File

@@ -178,8 +178,8 @@ class HostController(wsgi.Controller):
"""Sets the specified host's ability to accept new volumes.""" """Sets the specified host's ability to accept new volumes."""
context = req.environ['cinder.context'] context = req.environ['cinder.context']
state = "enabled" if enabled else "disabled" state = "enabled" if enabled else "disabled"
LOG.audit(_("Setting host %(host)s to %(state)s."), LOG.info(_("Setting host %(host)s to %(state)s."),
{'host': host, 'state': state}) {'host': host, 'state': state})
result = self.api.set_host_enabled(context, result = self.api.set_host_enabled(context,
host=host, host=host,
enabled=enabled) enabled=enabled)

12
cinder/api/contrib/volume_transfer.py
View File

@@ -160,9 +160,9 @@ class VolumeTransferController(wsgi.Controller):
name = transfer.get('name', None) name = transfer.get('name', None)
LOG.audit(_("Creating transfer of volume %s"), LOG.info(_("Creating transfer of volume %s"),
volume_id, volume_id,
context=context) context=context)
try: try:
new_transfer = self.transfer_api.create(context, volume_id, name) new_transfer = self.transfer_api.create(context, volume_id, name)
@@ -194,8 +194,8 @@ class VolumeTransferController(wsgi.Controller):
msg = _("Incorrect request body format") msg = _("Incorrect request body format")
raise exc.HTTPBadRequest(explanation=msg) raise exc.HTTPBadRequest(explanation=msg)
LOG.audit(_("Accepting transfer %s"), transfer_id, LOG.info(_("Accepting transfer %s"), transfer_id,
context=context) context=context)
try: try:
accepted_transfer = self.transfer_api.accept(context, transfer_id, accepted_transfer = self.transfer_api.accept(context, transfer_id,
@@ -215,7 +215,7 @@ class VolumeTransferController(wsgi.Controller):
"""Delete a transfer.""" """Delete a transfer."""
context = req.environ['cinder.context'] context = req.environ['cinder.context']
LOG.audit(_("Delete transfer with id: %s"), id, context=context) LOG.info(_("Delete transfer with id: %s"), id, context=context)
try: try:
self.transfer_api.delete(context, transfer_id=id) self.transfer_api.delete(context, transfer_id=id)

2
cinder/api/contrib/volume_unmanage.py
View File

@@ -51,7 +51,7 @@ class VolumeUnmanageController(wsgi.Controller):
context = req.environ['cinder.context'] context = req.environ['cinder.context']
authorize(context) authorize(context)
LOG.audit(_("Unmanage volume with id: %s"), id, context=context) LOG.info(_("Unmanage volume with id: %s"), id, context=context)
try: try:
vol = self.volume_api.get(context, id) vol = self.volume_api.get(context, id)

4
cinder/api/extensions.py
View File

@@ -181,7 +181,7 @@ class ExtensionManager(object):
""" """
def __init__(self): def __init__(self):
LOG.audit(_('Initializing extension manager.')) LOG.info(_('Initializing extension manager.'))
self.cls_list = CONF.osapi_volume_extension self.cls_list = CONF.osapi_volume_extension
self.extensions = {} self.extensions = {}
@@ -196,7 +196,7 @@ class ExtensionManager(object):
return return
alias = ext.alias alias = ext.alias
LOG.audit(_('Loaded extension: %s'), alias) LOG.info(_('Loaded extension: %s'), alias)
if alias in self.extensions: if alias in self.extensions:
raise exception.Error("Found duplicate extension: %s" % alias) raise exception.Error("Found duplicate extension: %s" % alias)

4
cinder/api/v1/snapshots.py
View File

@@ -116,7 +116,7 @@ class SnapshotsController(wsgi.Controller):
"""Delete a snapshot.""" """Delete a snapshot."""
context = req.environ['cinder.context'] context = req.environ['cinder.context']
LOG.audit(_("Delete snapshot with id: %s"), id, context=context) LOG.info(_("Delete snapshot with id: %s"), id, context=context)
try: try:
snapshot = self.volume_api.get_snapshot(context, id) snapshot = self.volume_api.get_snapshot(context, id)
@@ -180,7 +180,7 @@ class SnapshotsController(wsgi.Controller):
force = snapshot.get('force', False) force = snapshot.get('force', False)
msg = _("Create snapshot from volume %s") msg = _("Create snapshot from volume %s")
LOG.audit(msg, volume_id, context=context) LOG.info(msg, volume_id, context=context)
if not utils.is_valid_boolstr(force): if not utils.is_valid_boolstr(force):
msg = _("Invalid value '%s' for force. ") % force msg = _("Invalid value '%s' for force. ") % force

6
cinder/api/v1/volumes.py
View File

@@ -112,7 +112,7 @@ def _translate_volume_summary_view(context, vol, image_id=None):
if image_id: if image_id:
d['image_id'] = image_id d['image_id'] = image_id
LOG.audit(_("vol=%s"), vol, context=context) LOG.info(_("vol=%s"), vol, context=context)
if vol.get('volume_metadata'): if vol.get('volume_metadata'):
metadata = vol.get('volume_metadata') metadata = vol.get('volume_metadata')
@@ -243,7 +243,7 @@ class VolumeController(wsgi.Controller):
"""Delete a volume.""" """Delete a volume."""
context = req.environ['cinder.context'] context = req.environ['cinder.context']
LOG.audit(_("Delete volume with id: %s"), id, context=context) LOG.info(_("Delete volume with id: %s"), id, context=context)
try: try:
volume = self.volume_api.get(context, id) volume = self.volume_api.get(context, id)
@@ -367,7 +367,7 @@ class VolumeController(wsgi.Controller):
elif size is None and kwargs['source_volume'] is not None: elif size is None and kwargs['source_volume'] is not None:
size = kwargs['source_volume']['size'] size = kwargs['source_volume']['size']
LOG.audit(_("Create volume of %s GB"), size, context=context) LOG.info(_("Create volume of %s GB"), size, context=context)
image_href = None image_href = None
image_uuid = None image_uuid = None

4
cinder/api/v2/snapshots.py
View File

@@ -117,7 +117,7 @@ class SnapshotsController(wsgi.Controller):
"""Delete a snapshot.""" """Delete a snapshot."""
context = req.environ['cinder.context'] context = req.environ['cinder.context']
LOG.audit(_("Delete snapshot with id: %s"), id, context=context) LOG.info(_("Delete snapshot with id: %s"), id, context=context)
try: try:
snapshot = self.volume_api.get_snapshot(context, id) snapshot = self.volume_api.get_snapshot(context, id)
@@ -191,7 +191,7 @@ class SnapshotsController(wsgi.Controller):
raise exc.HTTPNotFound(explanation=msg) raise exc.HTTPNotFound(explanation=msg)
force = snapshot.get('force', False) force = snapshot.get('force', False)
msg = _("Create snapshot from volume %s") msg = _("Create snapshot from volume %s")
LOG.audit(msg, volume_id, context=context) LOG.info(msg, volume_id, context=context)
# NOTE(thingee): v2 API allows name instead of display_name # NOTE(thingee): v2 API allows name instead of display_name
if 'name' in snapshot: if 'name' in snapshot:

4
cinder/api/v2/volumes.py
View File

@@ -179,7 +179,7 @@ class VolumeController(wsgi.Controller):
"""Delete a volume.""" """Delete a volume."""
context = req.environ['cinder.context'] context = req.environ['cinder.context']
LOG.audit(_("Delete volume with id: %s"), id, context=context) LOG.info(_("Delete volume with id: %s"), id, context=context)
try: try:
volume = self.volume_api.get(context, id) volume = self.volume_api.get(context, id)
@@ -331,7 +331,7 @@ class VolumeController(wsgi.Controller):
elif size is None and kwargs['source_volume'] is not None: elif size is None and kwargs['source_volume'] is not None:
size = kwargs['source_volume']['size'] size = kwargs['source_volume']['size']
LOG.audit(_("Create volume of %s GB"), size, context=context) LOG.info(_("Create volume of %s GB"), size, context=context)
if self.ext_mgr.is_loaded('os-image-create'): if self.ext_mgr.is_loaded('os-image-create'):
image_href = volume.get('imageRef') image_href = volume.get('imageRef')

16
cinder/backup/api.py
View File

@@ -164,10 +164,10 @@ class API(base.Base):
name = 'restore_backup_%s' % backup_id name = 'restore_backup_%s' % backup_id
description = 'auto-created_from_restore_from_backup' description = 'auto-created_from_restore_from_backup'
LOG.audit(_("Creating volume of %(size)s GB for restore of " LOG.info(_("Creating volume of %(size)s GB for restore of "
"backup %(backup_id)s"), "backup %(backup_id)s"),
{'size': size, 'backup_id': backup_id}, {'size': size, 'backup_id': backup_id},
context=context) context=context)
volume = self.volume_api.create(context, size, name, description) volume = self.volume_api.create(context, size, name, description)
volume_id = volume['id'] volume_id = volume['id']
@@ -191,10 +191,10 @@ class API(base.Base):
{'volume_size': volume['size'], 'size': size}) {'volume_size': volume['size'], 'size': size})
raise exception.InvalidVolume(reason=msg) raise exception.InvalidVolume(reason=msg)
LOG.audit(_("Overwriting volume %(volume_id)s with restore of " LOG.info(_("Overwriting volume %(volume_id)s with restore of "
"backup %(backup_id)s"), "backup %(backup_id)s"),
{'volume_id': volume_id, 'backup_id': backup_id}, {'volume_id': volume_id, 'backup_id': backup_id},
context=context) context=context)
# Setting the status here rather than setting at start and unrolling # Setting the status here rather than setting at start and unrolling
# for each error condition, it should be a very small window # for each error condition, it should be a very small window

4
cinder/service.py
View File

@@ -101,8 +101,8 @@ class Service(service.Service):
def start(self): def start(self):
version_string = version.version_string() version_string = version.version_string()
LOG.audit(_('Starting %(topic)s node (version %(version_string)s)'), LOG.info(_('Starting %(topic)s node (version %(version_string)s)'),
{'topic': self.topic, 'version_string': version_string}) {'topic': self.topic, 'version_string': version_string})
self.model_disconnected = False self.model_disconnected = False
self.manager.init_host() self.manager.init_host()
ctxt = context.get_admin_context() ctxt = context.get_admin_context()