From f527955824474525983b8675b95684eade5eaf99 Mon Sep 17 00:00:00 2001 From: Josh Smith Date: Thu, 3 Sep 2020 14:39:15 +0100 Subject: _sandboxremote.py: Include details in UNAVAILABLE error logging --- src/buildstream/sandbox/_sandboxremote.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/buildstream/sandbox/_sandboxremote.py b/src/buildstream/sandbox/_sandboxremote.py index 41fb9e153..6cba7d611 100644 --- a/src/buildstream/sandbox/_sandboxremote.py +++ b/src/buildstream/sandbox/_sandboxremote.py @@ -214,8 +214,6 @@ class SandboxRemote(SandboxREAPI): except grpc.RpcError as e: status_code = e.code() - if status_code == grpc.StatusCode.UNAVAILABLE: - raise SandboxError("Failed contacting remote execution server at {}.".format(self.exec_url)) if status_code in ( grpc.StatusCode.INVALID_ARGUMENT, @@ -223,8 +221,12 @@ class SandboxRemote(SandboxREAPI): grpc.StatusCode.RESOURCE_EXHAUSTED, grpc.StatusCode.INTERNAL, grpc.StatusCode.DEADLINE_EXCEEDED, + grpc.StatusCode.UNAVAILABLE, ): - raise SandboxError("{} ({}).".format(e.details(), status_code.name)) + raise SandboxError( + "Failed contacting remote execution server at {}." + "{}: {}".format(self.exec_url, status_code.name, e.details()) + ) if running_operation and status_code == grpc.StatusCode.UNIMPLEMENTED: raise SandboxError( -- cgit v1.2.1