openstack
/
octavia
Code Issues Proposed changes

Improve logging in octavia.certificates 

We should delegate (when possible) formatting to the logger in order to
perform formatting only when needed, by using:

 LOG.<level>(message, data)

instead of:

 LOG.<level>(message % data)

and

 try:
   ...
 except ...:
   LOG.exception("lorem ipsum")

instead of:

 try:
   ...
 except ... as e:
   LOG.error("lorem ipsum: %s:", e)

Change-Id: I8052ebd026c380499c19562bcb29b05cd8a7f5f0
This commit is contained in:
Cedric Brandily 2015-10-01 23:29:34 +02:00
parent d41599e5a5
commit e7eaba1dfb
2 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
octavia/certificates/common/barbican.py
View File

@ -74,8 +74,7 @@ class BarbicanAuth(object):
cls._barbican_client = barbican_client.Client(
session=keystone.get_session()
)
except Exception as e:
except Exception:
with excutils.save_and_reraise_exception():
LOG.error(_LE(
"Error creating Barbican client: %s"), e)
LOG.exception(_LE("Error creating Barbican client"))
return cls._barbican_client

22
octavia/certificates/manager/local.py
View File

@ -88,9 +88,8 @@ class LocalCertManager(cert_mgr.CertManager):
certificate data
:raises CertificateStorageException: if certificate retrieval fails
"""
LOG.info(_LI(
"Loading certificate {0} from the local filesystem."
).format(cert_ref))
LOG.info(_LI("Loading certificate %s from the local filesystem."),
cert_ref)
filename_base = os.path.join(CONF.certificates.storage_path, cert_ref)
@ -105,9 +104,7 @@ class LocalCertManager(cert_mgr.CertManager):
with open(filename_certificate, 'r') as cert_file:
cert_data['certificate'] = cert_file.read()
except IOError:
LOG.error(_LE(
"Failed to read certificate for {0}."
).format(cert_ref))
LOG.error(_LE("Failed to read certificate for %s."), cert_ref)
raise exceptions.CertificateStorageException(
msg="Certificate could not be read."
)
@ -115,9 +112,7 @@ class LocalCertManager(cert_mgr.CertManager):
with open(filename_private_key, 'r') as key_file:
cert_data['private_key'] = key_file.read()
except IOError:
LOG.error(_LE(
"Failed to read private key for {0}."
).format(cert_ref))
LOG.error(_LE("Failed to read private key for %s"), cert_ref)
raise exceptions.CertificateStorageException(
msg="Private Key could not be read."
)
@ -144,9 +139,8 @@ class LocalCertManager(cert_mgr.CertManager):
:raises CertificateStorageException: if certificate deletion fails
"""
LOG.info(_LI(
"Deleting certificate {0} from the local filesystem."
).format(cert_ref))
LOG.info(_LI("Deleting certificate %s from the local filesystem."),
cert_ref)
filename_base = os.path.join(CONF.certificates.storage_path, cert_ref)
@ -161,7 +155,5 @@ class LocalCertManager(cert_mgr.CertManager):
os.remove(filename_intermediates)
os.remove(filename_pkp)
except IOError as ioe:
LOG.error(_LE(
"Failed to delete certificate {0}."
).format(cert_ref))
LOG.error(_LE("Failed to delete certificate %s"), cert_ref)
raise exceptions.CertificateStorageException(message=ioe.message)