aboutsummaryrefslogtreecommitdiffstats
path: root/logserver/src
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@verizonmedia.com>2019-03-28 15:34:17 +0100
committerBjørn Christian Seime <bjorncs@verizonmedia.com>2019-03-28 15:34:17 +0100
commit2b1dd4b48f93ee69aa4f03635dc88f516578b78d (patch)
tree387559eb7926271c59e798c4a04e48b79d72b5ab /logserver/src
parent3897e2af88e63a31bd1d1a1fbb188de5345f04d2 (diff)
Use correct jrt error code for method faliures
Diffstat (limited to 'logserver/src')
-rw-r--r--logserver/src/main/java/ai/vespa/logserver/protocol/ArchiveLogMessagesMethod.java7
1 files changed, 4 insertions, 3 deletions
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 dbc6ed49a04..15ee83f9a15 100644
--- a/logserver/src/main/java/ai/vespa/logserver/protocol/ArchiveLogMessagesMethod.java
+++ b/logserver/src/main/java/ai/vespa/logserver/protocol/ArchiveLogMessagesMethod.java
@@ -2,6 +2,7 @@
package ai.vespa.logserver.protocol;
import com.yahoo.jrt.DataValue;
+import com.yahoo.jrt.ErrorCode;
import com.yahoo.jrt.Int32Value;
import com.yahoo.jrt.Int8Value;
import com.yahoo.jrt.Method;
@@ -63,14 +64,14 @@ class ArchiveLogMessagesMethod {
try {
byte compressionType = rpcRequest.parameters().get(0).asInt8();
if (compressionType != 0) {
- rpcRequest.setError(0, "Invalid compression type: " + compressionType);
+ rpcRequest.setError(ErrorCode.METHOD_FAILED, "Invalid compression type: " + compressionType);
rpcRequest.returnRequest();
return;
}
int uncompressedSize = rpcRequest.parameters().get(1).asInt32();
byte[] logRequestPayload = rpcRequest.parameters().get(2).asData();
if (uncompressedSize != logRequestPayload.length) {
- rpcRequest.setError(1, String.format("Invalid uncompressed size: got %d while data is of size %d ", uncompressedSize, logRequestPayload.length));
+ rpcRequest.setError(ErrorCode.METHOD_FAILED, String.format("Invalid uncompressed size: got %d while data is of size %d ", uncompressedSize, logRequestPayload.length));
rpcRequest.returnRequest();
return;
}
@@ -83,7 +84,7 @@ class ArchiveLogMessagesMethod {
} catch (Exception e) {
String errorMessage = "Failed to handle log request: " + e.getMessage();
log.log(Level.WARNING, e, () -> errorMessage);
- rpcRequest.setError(2, errorMessage);
+ rpcRequest.setError(ErrorCode.METHOD_FAILED, errorMessage);
rpcRequest.returnRequest();
}
}