Merge asyncdispatch2 let->var changes

This commit is contained in:
coffeepots 2018-06-12 09:13:02 +01:00
commit 687c577942
2 changed files with 5 additions and 3 deletions

View File

@ -19,7 +19,7 @@ proc call*(self: RpcClient, name: string,
## Remotely calls the specified RPC method.
let id = $self.nextId
self.nextId.inc
let msg = $ %{"jsonrpc": %"2.0", "method": %name, "params": params,
var msg = $ %{"jsonrpc": %"2.0", "method": %name, "params": params,
"id": %id} & "\c\l"
let res = await self.transp.write(msg)
# TODO: Add actions when not full packet was send, e.g. disconnect peer.

View File

@ -85,7 +85,8 @@ proc sendError*(client: StreamTransport, code: int, msg: string, id: JsonNode,
## Send error message to client
let error = %{"code": %(code), "message": %msg, "data": data}
debug "Error generated", error = error, id = id
result = client.write(wrapReply(id, newJNull(), error))
var res = wrapReply(id, newJNull(), error)
result = client.write(res)
proc sendJsonError*(state: RpcJsonError, client: StreamTransport, id: JsonNode,
data = newJNull()) {.async.} =
@ -117,7 +118,8 @@ proc processMessage(server: RpcServer, client: StreamTransport,
%(methodName & " is not a registered method."))
else:
let callRes = await server.procs[methodName](node["params"])
discard await client.write(wrapReply(id, callRes, newJNull()))
var res = wrapReply(id, callRes, newJNull())
discard await client.write(res)
proc processClient(server: StreamServer, client: StreamTransport) {.async, gcsafe.} =
var rpc = getUserData[RpcServer](server)