diff options
| author | Yuriy Taraday <yorik.sar@gmail.com> | 2011-05-06 18:01:42 +0000 |
|---|---|---|
| committer | Tarmac <> | 2011-05-06 18:01:42 +0000 |
| commit | 016be4ccdfe3f7791021bc717a1445b36cde371f (patch) | |
| tree | 8d90c045d63df0f67372cb5573008567ece42a1c /nova/compute | |
| parent | 114a55d0243f79db7ea1ef29830a9428dbf1aa33 (diff) | |
| parent | 6160e3dbdf0dcc736fb650d025da89b269edbf59 (diff) | |
Sanitize get_console_output results. See bug #758054
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/manager.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 1ff78007b..c6f957073 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -749,7 +749,8 @@ class ComputeManager(manager.SchedulerDependentManager): instance_ref = self.db.instance_get(context, instance_id) LOG.audit(_("Get console output for instance %s"), instance_id, context=context) - return self.driver.get_console_output(instance_ref) + output = self.driver.get_console_output(instance_ref) + return output.decode('utf-8', 'replace').encode('ascii', 'replace') @exception.wrap_exception def get_ajax_console(self, context, instance_id): |