Use oslo_log to instead of app.logger
Change-Id: I7228402a86111925389396039a5ba444170a83ca Closes-Bug: #1668558
This commit is contained in:
Hongbin Lu
parent
d6de55486e
commit
8bc3dbecfb
|
|
@ -16,6 +16,7 @@ import os
|
|||
|
||||
from oslo_concurrency import processutils
|
||||
from oslo_config import cfg
|
||||
from oslo_log import log
|
||||
from oslo_utils import importutils
|
||||
|
||||
from fuxi import app
|
||||
|
|
@ -25,6 +26,8 @@ from fuxi import utils
|
|||
|
||||
CONF = cfg.CONF
|
||||
|
||||
LOG = log.getLogger(__name__)
|
||||
|
||||
CINDER = 'cinder'
|
||||
MANILA = 'manila'
|
||||
|
||||
|
|
@ -44,10 +47,9 @@ def init_app_conf():
|
|||
if provider in volume_providers_conf:
|
||||
app.volume_providers[provider] = importutils\
|
||||
.import_class(volume_providers_conf[provider])()
|
||||
app.logger.info(_LI("Load volume provider: %s"), provider)
|
||||
LOG.info(_LI("Load volume provider: %s"), provider)
|
||||
else:
|
||||
app.logger.warning(_LW("Could not find volume provider: %s"),
|
||||
provider)
|
||||
LOG.warning(_LW("Could not find volume provider: %s"), provider)
|
||||
if not app.volume_providers:
|
||||
raise Exception("Not provide at least one effective volume provider")
|
||||
|
||||
|
|
@ -72,25 +74,24 @@ def get_docker_volume(docker_volume_name):
|
|||
|
||||
@app.route('/Plugin.Activate', methods=['POST'])
|
||||
def plugin_activate():
|
||||
app.logger.info(_LI("/Plugin.Activate"))
|
||||
LOG.info(_LI("/Plugin.Activate"))
|
||||
return flask.jsonify(Implements=[u'VolumeDriver'])
|
||||
|
||||
|
||||
@app.route('/VolumeDriver.Create', methods=['POST'])
|
||||
def volumedriver_create():
|
||||
json_data = flask.request.get_json(force=True)
|
||||
app.logger.info(_LI("Received JSON data %s for "
|
||||
"/VolumeDriver.Create"), json_data)
|
||||
LOG.info(_LI("Received JSON data %s for /VolumeDriver.Create"), json_data)
|
||||
|
||||
docker_volume_name = json_data.get('Name', None)
|
||||
volume_opts = json_data.get('Opts', None) or {}
|
||||
if not docker_volume_name:
|
||||
msg = _("Request /VolumeDriver.Create need parameter 'Name'")
|
||||
app.logger.error(msg)
|
||||
LOG.error(msg)
|
||||
raise exceptions.InvalidInput(msg)
|
||||
if not isinstance(volume_opts, dict):
|
||||
msg = _("Request parameter 'Opts' must be dict type")
|
||||
app.logger.error(msg)
|
||||
LOG.error(msg)
|
||||
raise exceptions.InvalidInput(msg)
|
||||
|
||||
volume_provider_type = volume_opts.get('volume_provider', None)
|
||||
|
|
@ -100,7 +101,7 @@ def volumedriver_create():
|
|||
if volume_provider_type not in app.volume_providers:
|
||||
msg_fmt = _("Could not find a handler for %(volume_provider_type)s "
|
||||
"volume") % {'volume_provider_type': volume_provider_type}
|
||||
app.logger.error(msg_fmt)
|
||||
LOG.error(msg_fmt)
|
||||
return flask.jsonify(Err=msg_fmt)
|
||||
|
||||
# If the volume with the same name already exists in other volume
|
||||
|
|
@ -110,7 +111,7 @@ def volumedriver_create():
|
|||
and provider.check_exist(docker_volume_name):
|
||||
msg_fmt = _("The volume with the same name already exists in "
|
||||
"other volume provider backend")
|
||||
app.logger.error(msg_fmt)
|
||||
LOG.error(msg_fmt)
|
||||
return flask.jsonify(Err=msg_fmt)
|
||||
|
||||
# Create if volume does not exist, or attach to this server if needed
|
||||
|
|
@ -124,13 +125,12 @@ def volumedriver_create():
|
|||
@app.route('/VolumeDriver.Remove', methods=['POST'])
|
||||
def volumedriver_remove():
|
||||
json_data = flask.request.get_json(force=True)
|
||||
app.logger.info(_LI("Received JSON data %s for "
|
||||
"/VolumeDriver.Remove"), json_data)
|
||||
LOG.info(_LI("Received JSON data %s for /VolumeDriver.Remove"), json_data)
|
||||
|
||||
docker_volume_name = json_data.get('Name', None)
|
||||
if not docker_volume_name:
|
||||
msg = _("Request /VolumeDriver.Remove need parameter 'Name'")
|
||||
app.logger.error(msg)
|
||||
LOG.error(msg)
|
||||
raise exceptions.InvalidInput(msg)
|
||||
|
||||
for provider in app.volume_providers.values():
|
||||
|
|
@ -143,13 +143,12 @@ def volumedriver_remove():
|
|||
@app.route('/VolumeDriver.Mount', methods=['POST'])
|
||||
def volumedriver_mount():
|
||||
json_data = flask.request.get_json(force=True)
|
||||
app.logger.info(_LI("Receive JSON data %s for "
|
||||
"/VolumeDriver.Mount"), json_data)
|
||||
LOG.info(_LI("Receive JSON data %s for /VolumeDriver.Mount"), json_data)
|
||||
|
||||
docker_volume_name = json_data.get('Name', None)
|
||||
if not docker_volume_name:
|
||||
msg = _("Request /VolumeDriver.Mount need parameter 'Name'")
|
||||
app.logger.error(msg)
|
||||
LOG.error(msg)
|
||||
raise exceptions.InvalidInput(msg)
|
||||
|
||||
for provider in app.volume_providers.values():
|
||||
|
|
@ -163,68 +162,65 @@ def volumedriver_mount():
|
|||
@app.route('/VolumeDriver.Path', methods=['POST'])
|
||||
def volumedriver_path():
|
||||
json_data = flask.request.get_json(force=True)
|
||||
app.logger.info(_LI("Receive JSON data %s for "
|
||||
"/VolumeDriver.Path"), json_data)
|
||||
LOG.info(_LI("Receive JSON data %s for /VolumeDriver.Path"), json_data)
|
||||
|
||||
docker_volume_name = json_data.get('Name', None)
|
||||
if not docker_volume_name:
|
||||
msg = _("Request /VolumeDriver.Path need parameter 'Name'")
|
||||
app.logger.error(msg)
|
||||
LOG.error(msg)
|
||||
raise exceptions.InvalidInput(msg)
|
||||
|
||||
volume = get_docker_volume(docker_volume_name)
|
||||
if volume is not None:
|
||||
mountpoint = volume.get('Mountpoint', '')
|
||||
app.logger.info("Get mountpoint %(mp)s for docker volume %(name)s"
|
||||
% {'mp': mountpoint, 'name': docker_volume_name})
|
||||
LOG.info(_LI("Get mountpoint %(mp)s for docker volume %(name)s"),
|
||||
{'mp': mountpoint, 'name': docker_volume_name})
|
||||
return flask.jsonify(Mountpoint=mountpoint, Err=u'')
|
||||
|
||||
app.logger.warning(_LW("Can't find mountpoint for docker volume "
|
||||
"%(name)s") % {'name': docker_volume_name})
|
||||
LOG.warning(_LW("Can't find mountpoint for docker volume %(name)s"),
|
||||
{'name': docker_volume_name})
|
||||
return flask.jsonify(Err=u'Mountpoint Not Found')
|
||||
|
||||
|
||||
@app.route('/VolumeDriver.Unmount', methods=['POST'])
|
||||
def volumedriver_unmount():
|
||||
json_data = flask.request.get_json(force=True)
|
||||
app.logger.info(_LI('Receive JSON data %s for '
|
||||
'VolumeDriver.Unmount'), json_data)
|
||||
LOG.info(_LI('Receive JSON data %s for VolumeDriver.Unmount'), json_data)
|
||||
return flask.jsonify(Err=u'')
|
||||
|
||||
|
||||
@app.route('/VolumeDriver.Get', methods=['POST'])
|
||||
def volumedriver_get():
|
||||
json_data = flask.request.get_json(force=True)
|
||||
app.logger.info(_LI("Receive JSON data %s for "
|
||||
"/VolumeDriver.Get"), json_data)
|
||||
LOG.info(_LI("Receive JSON data %s for /VolumeDriver.Get"), json_data)
|
||||
|
||||
docker_volume_name = json_data.get('Name', None)
|
||||
if not docker_volume_name:
|
||||
msg = _("Request /VolumeDriver.Get need parameter 'Name'")
|
||||
app.logger.error(msg)
|
||||
LOG.error(msg)
|
||||
raise exceptions.InvalidInput(msg)
|
||||
|
||||
volume = get_docker_volume(docker_volume_name)
|
||||
if volume is not None:
|
||||
app.logger.info(_LI("Get docker volume: %s"), volume)
|
||||
LOG.info(_LI("Get docker volume: %s"), volume)
|
||||
return flask.jsonify(Volume=volume, Err=u'')
|
||||
|
||||
app.logger.warning(_LW("Can't find volume %s from every "
|
||||
"provider"), docker_volume_name)
|
||||
LOG.warning(_LW("Can't find volume %s from every provider"),
|
||||
docker_volume_name)
|
||||
return flask.jsonify(Err=u'Volume Not Found')
|
||||
|
||||
|
||||
@app.route('/VolumeDriver.List', methods=['POST'])
|
||||
def volumedriver_list():
|
||||
app.logger.info(_LI("/VolumeDriver.List"))
|
||||
LOG.info(_LI("/VolumeDriver.List"))
|
||||
docker_volumes = []
|
||||
for provider in app.volume_providers.values():
|
||||
vs = provider.list()
|
||||
if vs:
|
||||
docker_volumes.extend(vs)
|
||||
|
||||
app.logger.info(_LI("Get volumes from volume providers. "
|
||||
"Volumes: %s"), docker_volumes)
|
||||
LOG.info(_LI("Get volumes from volume providers. Volumes: %s"),
|
||||
docker_volumes)
|
||||
return flask.jsonify(Err=u'', Volumes=docker_volumes)
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -108,8 +108,8 @@ def make_json_app(import_name, **kwargs):
|
|||
@app.errorhandler(processutils.ProcessExecutionError)
|
||||
@app.errorhandler(brick_exception.BrickException)
|
||||
def make_json_error(ex):
|
||||
app.logger.error(_LE("Unexpected error happened: %s"),
|
||||
traceback.format_exc())
|
||||
LOG.error(_LE("Unexpected error happened: %s"),
|
||||
traceback.format_exc())
|
||||
response = flask.jsonify({"Err": str(ex)})
|
||||
response.status_code = w_exceptions.InternalServerError.code
|
||||
if isinstance(ex, w_exceptions.HTTPException):
|
||||
|
|
|
|||
Loading…
Reference in New Issue