Fix deprecated warnings.

This commit is contained in:
cheatfate 2019-03-25 08:58:35 +02:00 committed by zah
parent 159f9b816e
commit 2d3db88137
3 changed files with 19 additions and 19 deletions

View File

@ -15,10 +15,10 @@ type
options: HttpClientOptions options: HttpClientOptions
const const
MaxHttpHeadersSize = 8192 # maximum size of HTTP headers in octets MaxHttpHeadersSize = 8192 # maximum size of HTTP headers in octets
MaxHttpRequestSize = 128 * 1024 # maximum size of HTTP body in octets MaxHttpRequestSize = 128 * 1024 # maximum size of HTTP body in octets
HttpHeadersTimeout = 120000 # timeout for receiving headers (120 sec) HttpHeadersTimeout = 120.seconds # timeout for receiving headers (120 sec)
HttpBodyTimeout = 12000 # timeout for receiving body (12 sec) HttpBodyTimeout = 12.seconds # timeout for receiving body (12 sec)
HeadersMark = @[byte(0x0D), byte(0x0A), byte(0x0D), byte(0x0A)] HeadersMark = @[byte(0x0D), byte(0x0A), byte(0x0D), byte(0x0A)]
proc sendRequest(transp: StreamTransport, proc sendRequest(transp: StreamTransport,

View File

@ -6,10 +6,10 @@ logScope:
topic = "JSONRPC-HTTP-SERVER" topic = "JSONRPC-HTTP-SERVER"
const const
MaxHttpHeadersSize = 8192 # maximum size of HTTP headers in octets MaxHttpHeadersSize = 8192 # maximum size of HTTP headers in octets
MaxHttpRequestSize = 128 * 1024 # maximum size of HTTP body in octets MaxHttpRequestSize = 128 * 1024 # maximum size of HTTP body in octets
HttpHeadersTimeout = 120000 # timeout for receiving headers (120 sec) HttpHeadersTimeout = 120.seconds # timeout for receiving headers (120 sec)
HttpBodyTimeout = 12000 # timeout for receiving body (12 sec) HttpBodyTimeout = 12.seconds # timeout for receiving body (12 sec)
HeadersMark = @[byte(0x0D), byte(0x0A), byte(0x0D), byte(0x0A)] HeadersMark = @[byte(0x0D), byte(0x0A), byte(0x0D), byte(0x0A)]
type type
@ -231,13 +231,13 @@ proc addStreamServer*(server: RpcHttpServer, address: string) =
# Attempt to resolve `address` for IPv4 address space. # Attempt to resolve `address` for IPv4 address space.
try: try:
tas4 = resolveTAddress(address, IpAddressFamily.IPv4) tas4 = resolveTAddress(address, AddressFamily.IPv4)
except: except:
discard discard
# Attempt to resolve `address` for IPv6 address space. # Attempt to resolve `address` for IPv6 address space.
try: try:
tas6 = resolveTAddress(address, IpAddressFamily.IPv6) tas6 = resolveTAddress(address, AddressFamily.IPv6)
except: except:
discard discard
@ -264,13 +264,13 @@ proc addStreamServer*(server: RpcHttpServer, address: string, port: Port) =
# Attempt to resolve `address` for IPv4 address space. # Attempt to resolve `address` for IPv4 address space.
try: try:
tas4 = resolveTAddress(address, port, IpAddressFamily.IPv4) tas4 = resolveTAddress(address, port, AddressFamily.IPv4)
except: except:
discard discard
# Attempt to resolve `address` for IPv6 address space. # Attempt to resolve `address` for IPv6 address space.
try: try:
tas6 = resolveTAddress(address, port, IpAddressFamily.IPv6) tas6 = resolveTAddress(address, port, AddressFamily.IPv6)
except: except:
discard discard

View File

@ -47,7 +47,7 @@ proc addStreamServers*(server: RpcSocketServer, addresses: openarray[TransportAd
server.addStreamServer(item) server.addStreamServer(item)
proc addStreamServer*(server: RpcSocketServer, address: string) = proc addStreamServer*(server: RpcSocketServer, address: string) =
## Create new server and assign it to addresses ``addresses``. ## Create new server and assign it to addresses ``addresses``.
var var
tas4: seq[TransportAddress] tas4: seq[TransportAddress]
tas6: seq[TransportAddress] tas6: seq[TransportAddress]
@ -55,13 +55,13 @@ proc addStreamServer*(server: RpcSocketServer, address: string) =
# Attempt to resolve `address` for IPv4 address space. # Attempt to resolve `address` for IPv4 address space.
try: try:
tas4 = resolveTAddress(address, IpAddressFamily.IPv4) tas4 = resolveTAddress(address, AddressFamily.IPv4)
except: except:
discard discard
# Attempt to resolve `address` for IPv6 address space. # Attempt to resolve `address` for IPv6 address space.
try: try:
tas6 = resolveTAddress(address, IpAddressFamily.IPv6) tas6 = resolveTAddress(address, AddressFamily.IPv6)
except: except:
discard discard
@ -88,13 +88,13 @@ proc addStreamServer*(server: RpcSocketServer, address: string, port: Port) =
# Attempt to resolve `address` for IPv4 address space. # Attempt to resolve `address` for IPv4 address space.
try: try:
tas4 = resolveTAddress(address, port, IpAddressFamily.IPv4) tas4 = resolveTAddress(address, port, AddressFamily.IPv4)
except: except:
discard discard
# Attempt to resolve `address` for IPv6 address space. # Attempt to resolve `address` for IPv6 address space.
try: try:
tas6 = resolveTAddress(address, port, IpAddressFamily.IPv6) tas6 = resolveTAddress(address, port, AddressFamily.IPv6)
except: except:
discard discard
@ -118,13 +118,13 @@ proc addStreamServer*(server: RpcSocketServer, address: string, port: Port) =
proc newRpcSocketServer*: RpcSocketServer = proc newRpcSocketServer*: RpcSocketServer =
RpcSocketServer(router: newRpcRouter(), servers: @[]) RpcSocketServer(router: newRpcRouter(), servers: @[])
proc newRpcSocketServer*(addresses: openarray[TransportAddress]): RpcSocketServer = proc newRpcSocketServer*(addresses: openarray[TransportAddress]): RpcSocketServer =
## Create new server and assign it to addresses ``addresses``. ## Create new server and assign it to addresses ``addresses``.
result = newRpcSocketServer() result = newRpcSocketServer()
result.addStreamServers(addresses) result.addStreamServers(addresses)
proc newRpcSocketServer*(addresses: openarray[string]): RpcSocketServer = proc newRpcSocketServer*(addresses: openarray[string]): RpcSocketServer =
## Create new server and assign it to addresses ``addresses``. ## Create new server and assign it to addresses ``addresses``.
result = newRpcSocketServer() result = newRpcSocketServer()
result.addStreamServers(addresses) result.addStreamServers(addresses)