From c3b2ae26c5b819178eb62ad3c037d26eedcf0c54 Mon Sep 17 00:00:00 2001
From: Eric Liang <ekhliang@gmail.com>
Date: Thu, 10 Oct 2019 16:53:18 -0700
Subject: [PATCH] Fix str of RayTaskError (#5878)

* fix key error

* fix
---
 python/ray/exceptions.py | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/python/ray/exceptions.py b/python/ray/exceptions.py
index 0d36e192f..92897a3e7 100644
--- a/python/ray/exceptions.py
+++ b/python/ray/exceptions.py
@@ -34,10 +34,13 @@ class RayTaskError(RayError):
                  function_name,
                  traceback_str,
                  cause_cls,
+                 proctitle=None,
                  pid=None,
                  ip=None):
         """Initialize a RayTaskError."""
-        if setproctitle:
+        if proctitle:
+            self.proctitle = proctitle
+        elif setproctitle:
             self.proctitle = setproctitle.getproctitle()
         else:
             self.proctitle = "ray_worker"
@@ -58,24 +61,22 @@ class RayTaskError(RayError):
         if issubclass(RayTaskError, self.cause_cls):
             return self  # already satisfied
 
-        class cls(self.cause_cls, RayTaskError):
-            def __init__(self, function_name, traceback_str, cause_cls, pid,
-                         host):
+        class cls(RayTaskError, self.cause_cls):
+            def __init__(self, function_name, traceback_str, cause_cls,
+                         proctitle, pid, ip):
                 RayTaskError.__init__(self, function_name, traceback_str,
-                                      cause_cls, pid, host)
+                                      cause_cls, proctitle, pid, ip)
 
         name = "RayTaskError({})".format(self.cause_cls.__name__)
         cls.__name__ = name
         cls.__qualname__ = name
 
         return cls(self.function_name, self.traceback_str, self.cause_cls,
-                   self.pid, self.ip)
-        cls.original = self
-        return cls
+                   self.proctitle, self.pid, self.ip)
 
     def __str__(self):
         """Format a RayTaskError as a string."""
-        lines = self.traceback_str.split("\n")
+        lines = self.traceback_str.strip().split("\n")
         out = []
         in_worker = False
         for line in lines: