From 35e91d27c94f7f047201412654621b76df5dfe99 Mon Sep 17 00:00:00 2001 From: Andrew Shvayka Date: Fri, 26 Oct 2018 18:53:12 +0300 Subject: [PATCH] Few minor improvements --- .../server/service/rpc/DefaultDeviceRpcService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/src/main/java/org/thingsboard/server/service/rpc/DefaultDeviceRpcService.java b/application/src/main/java/org/thingsboard/server/service/rpc/DefaultDeviceRpcService.java index 7aa2505d4b..e13f8656d3 100644 --- a/application/src/main/java/org/thingsboard/server/service/rpc/DefaultDeviceRpcService.java +++ b/application/src/main/java/org/thingsboard/server/service/rpc/DefaultDeviceRpcService.java @@ -119,7 +119,7 @@ public class DefaultDeviceRpcService implements DeviceRpcService { @Override public void processRpcResponseFromDevice(FromDeviceRpcResponse response) { - log.trace("response to request: [{}]", response.getId()); + log.trace("[{}] Received device RPC response from server: [{}]", response.getId(), response.getServerAddress()); if (routingService.getCurrentServer().equals(response.getServerAddress())) { UUID requestId = response.getId(); Consumer consumer = localToDeviceRpcRequests.remove(requestId); @@ -151,7 +151,7 @@ public class DefaultDeviceRpcService implements DeviceRpcService { throw new RuntimeException(e); } RpcError error = proto.getError() > 0 ? RpcError.values()[proto.getError()] : null; - FromDeviceRpcResponse response = new FromDeviceRpcResponse(new UUID(proto.getRequestIdMSB(), proto.getRequestIdLSB()), routingService.getCurrentServer(), + FromDeviceRpcResponse response = new FromDeviceRpcResponse(new UUID(proto.getRequestIdMSB(), proto.getRequestIdLSB()), serverAddress, proto.getResponse(), error); processRpcResponseFromDevice(response); }