From 2ed141b0dea57167dba8f6cb56bd387d8550073e Mon Sep 17 00:00:00 2001 From: coffeepots Date: Wed, 11 Jul 2018 19:17:21 +0100 Subject: [PATCH] Removed error processing in processClient, this is already in router --- json_rpc/transports/socket.nim | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/json_rpc/transports/socket.nim b/json_rpc/transports/socket.nim index a5e5424..8d7cc89 100644 --- a/json_rpc/transports/socket.nim +++ b/json_rpc/transports/socket.nim @@ -1,4 +1,5 @@ -import ../ server, json, chronicles +import ../ server, json +export server type RpcSocketServer* = ref object of RpcServer @@ -24,21 +25,8 @@ proc processClient(server: StreamServer, transport: StreamTransport) {.async, gc debug "Processing message", address = transport.remoteAddress(), line = value - let future = rpc.route(value) - yield future - if future.failed: - if future.readError of RpcProcError: - let err = future.readError.RpcProcError - await transport.sendError(err.code, err.msg, err.data) - elif future.readError of ValueError: - let err = future.readError[].ValueError - await transport.sendError(INVALID_PARAMS, err.msg, %"") - else: - await transport.sendError(SERVER_ERROR, - "Error: Unknown error occurred", %"") - else: - let res = await future - result = transport.write(res) + let res = await rpc.route(value) + result = transport.write(res) # Utility functions for setting up servers using stream transport addresses