openstack/python-openstackclient
Code Issues Proposed changes

Fix crashing "console log show"

Browse Source 
Because of encoding issue, the "openstack console show log" is prone to
a stack dump, as explained in the bug report.

Use the stdout handle that has already been set up by cliff's App class
with a sane default encoding.

Change-Id: I4d8b0df7f16ee0463e638bb11276220e5b92023b
Closes-Bug: 1747862
This commit is contained in:
Thomas Goirand 2018-02-07 09:25:33 +01:00 committed by Dean Troyer
parent 25e60a4bf1
commit 9a17356854
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
openstackclient/compute/v2/console.py
View File

@ -15,8 +15,6 @@
"""Compute v2 Console action implementations""" """Compute v2 Console action implementations"""
import sys
from osc_lib.cli import parseractions from osc_lib.cli import parseractions
from osc_lib.command import command from osc_lib.command import command
from osc_lib import utils from osc_lib import utils
@ -60,7 +58,10 @@ class ShowConsoleLog(command.Command):
length += 1 length += 1
data = server.get_console_output(length=length) data = server.get_console_output(length=length)
sys.stdout.write(data)
if data and data[-1] != '\n':
data += '\n'
self.app.stdout.write(data)
class ShowConsoleURL(command.ShowOne): class ShowConsoleURL(command.ShowOne):