openstack/nova
Code Issues Proposed changes

Merge "xvp: Remove use of '_LI' marker"

Browse Source
This commit is contained in:
Zuul 2019-07-24 03:57:05 +00:00 committed by Gerrit Code Review
commit a3a8e895b3
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
nova/vnc/xvp_proxy.py
View File

@ -28,7 +28,6 @@ import webob
import nova.conf import nova.conf
from nova import context from nova import context
from nova import exception from nova import exception
from nova.i18n import _LI
from nova import objects from nova import objects
from nova import utils from nova import utils
from nova import version from nova import version
@ -82,13 +81,12 @@ class XCPVNCProxy(object):
data += b data += b
if data.find("\r\n\r\n") != -1: if data.find("\r\n\r\n") != -1:
if not data.split("\r\n")[0].find("200"): if not data.split("\r\n")[0].find("200"):
LOG.info(_LI("Error in handshake format: %s"), LOG.info("Error in handshake format: %s", data)
data)
return return
break break
if not b or len(data) > 4096: if not b or len(data) > 4096:
LOG.info(_LI("Error in handshake: %s"), data) LOG.info("Error in handshake: %s", data)
return return
client = req.environ['eventlet.input'].get_socket() client = req.environ['eventlet.input'].get_socket()
@ -103,7 +101,7 @@ class XCPVNCProxy(object):
t0.wait() t0.wait()
if not sockets.get('client') or not sockets.get('server'): if not sockets.get('client') or not sockets.get('server'):
LOG.info(_LI("Invalid request: %s"), req) LOG.info("Invalid request: %s", req)
start_response('400 Invalid Request', start_response('400 Invalid Request',
[('content-type', 'text/html')]) [('content-type', 'text/html')])
return "Invalid Request" return "Invalid Request"
@ -123,10 +121,10 @@ class XCPVNCProxy(object):
def __call__(self, environ, start_response): def __call__(self, environ, start_response):
try: try:
req = webob.Request(environ) req = webob.Request(environ)
LOG.info(_LI("Request: %s"), req) LOG.info("Request: %s", req)
token = req.params.get('token') token = req.params.get('token')
if not token: if not token:
LOG.info(_LI("Request made with missing token: %s"), req) LOG.info("Request made with missing token: %s", req)
start_response('400 Invalid Request', start_response('400 Invalid Request',
[('content-type', 'text/html')]) [('content-type', 'text/html')])
return "Invalid Request" return "Invalid Request"
@ -137,14 +135,14 @@ class XCPVNCProxy(object):
connect_info = objects.ConsoleAuthToken.validate( connect_info = objects.ConsoleAuthToken.validate(
ctxt, token).to_dict() ctxt, token).to_dict()
except exception.InvalidToken: except exception.InvalidToken:
LOG.info(_LI("Request made with invalid token: %s"), req) LOG.info("Request made with invalid token: %s", req)
start_response('401 Not Authorized', start_response('401 Not Authorized',
[('content-type', 'text/html')]) [('content-type', 'text/html')])
return "Not Authorized" return "Not Authorized"
return self.proxy_connection(req, connect_info, start_response) return self.proxy_connection(req, connect_info, start_response)
except Exception as e: except Exception as e:
LOG.info(_LI("Unexpected error: %s"), e) LOG.info("Unexpected error: %s", e)
class SafeHttpProtocol(eventlet.wsgi.HttpProtocol): class SafeHttpProtocol(eventlet.wsgi.HttpProtocol):
@ -164,8 +162,8 @@ class SafeHttpProtocol(eventlet.wsgi.HttpProtocol):
def get_wsgi_server(): def get_wsgi_server():
LOG.info(_LI("Starting nova-xvpvncproxy node (version %s)"), LOG.info("Starting nova-xvpvncproxy node (version %s)",
version.version_string_with_package()) version.version_string_with_package())
LOG.warning('The nova-xvpvncproxy service is deprecated as it is Xen ' LOG.warning('The nova-xvpvncproxy service is deprecated as it is Xen '
'specific and has effectively been replaced by noVNC ' 'specific and has effectively been replaced by noVNC '