External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-06 08:57:35 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1194 from chrismeyersfsu/fix-more_better_unicode_handling

Browse Source 
better unicode handling
This commit is contained in:
Chris Meyers
2018-04-02 16:31:21 -04:00
committed by GitHub
parent b905aec1d4 557637afcb
commit d2c9bd2f3b
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
awx/main/exceptions.py
View File

@@ -1,6 +1,9 @@
# Copyright (c) 2018 Ansible by Red Hat # Copyright (c) 2018 Ansible by Red Hat
# All Rights Reserved. # All Rights Reserved.
import six
# Celery does not respect exception type when using a serializer different than pickle; # Celery does not respect exception type when using a serializer different than pickle;
# and awx uses the json serializer # and awx uses the json serializer
# https://github.com/celery/celery/issues/3586 # https://github.com/celery/celery/issues/3586
@@ -9,7 +12,7 @@
class _AwxTaskError(): class _AwxTaskError():
def build_exception(self, task, message=None): def build_exception(self, task, message=None):
if message is None: if message is None:
message = "Execution error running {}".format(task.log_format) message = six.text_type("Execution error running {}").format(task.log_format)
e = Exception(message) e = Exception(message)
e.task = task e.task = task
e.is_awx_task_error = True e.is_awx_task_error = True
@@ -17,7 +20,7 @@ class _AwxTaskError():
def TaskCancel(self, task, rc): def TaskCancel(self, task, rc):
"""Canceled flag caused run_pexpect to kill the job run""" """Canceled flag caused run_pexpect to kill the job run"""
message="{} was canceled (rc={})".format(task.log_format, rc) message=six.text_type("{} was canceled (rc={})").format(task.log_format, rc)
e = self.build_exception(task, message) e = self.build_exception(task, message)
e.rc = rc e.rc = rc
e.awx_task_error_type = "TaskCancel" e.awx_task_error_type = "TaskCancel"
@@ -25,7 +28,7 @@ class _AwxTaskError():
def TaskError(self, task, rc): def TaskError(self, task, rc):
"""Userspace error (non-zero exit code) in run_pexpect subprocess""" """Userspace error (non-zero exit code) in run_pexpect subprocess"""
message = "{} encountered an error (rc={}), please see task stdout for details.".format(task.log_format, rc) message = six.text_type("{} encountered an error (rc={}), please see task stdout for details.").format(task.log_format, rc)
e = self.build_exception(task, message) e = self.build_exception(task, message)
e.rc = rc e.rc = rc
e.awx_task_error_type = "TaskError" e.awx_task_error_type = "TaskError"