From 3897e2af88e63a31bd1d1a1fbb188de5345f04d2 Mon Sep 17 00:00:00 2001
From: Bjørn Christian Seime <bjorncs@verizonmedia.com>
Date: Thu, 28 Mar 2019 14:18:21 +0100
Subject: Return error response when request fails

---
 .../java/ai/vespa/logserver/protocol/ArchiveLogMessagesMethod.java   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'logserver/src')

diff --git a/logserver/src/main/java/ai/vespa/logserver/protocol/ArchiveLogMessagesMethod.java b/logserver/src/main/java/ai/vespa/logserver/protocol/ArchiveLogMessagesMethod.java
index 93700aa1a46..dbc6ed49a04 100644
--- a/logserver/src/main/java/ai/vespa/logserver/protocol/ArchiveLogMessagesMethod.java
+++ b/logserver/src/main/java/ai/vespa/logserver/protocol/ArchiveLogMessagesMethod.java
@@ -81,7 +81,10 @@ class ArchiveLogMessagesMethod {
                 rpcRequest.returnValues().add(new DataValue(responsePayload));
                 rpcRequest.returnRequest();
             } catch (Exception e) {
-                log.log(Level.WARNING, e, () -> "Failed to handle log request: " + e.getMessage());
+                String errorMessage = "Failed to handle log request: " + e.getMessage();
+                log.log(Level.WARNING, e, () -> errorMessage);
+                rpcRequest.setError(2, errorMessage);
+                rpcRequest.returnRequest();
             }
         }
     }
-- 
cgit v1.2.3