# HG changeset patch # User Mahlon E. Smith # Date 1542657947 28800 # Node ID 96b8799a565a73ccb73da57a8d3caec085b71056 # Parent fce5b4150c090504a3f1c3296f9fad9b436febc5 Fix command line usage docs, replace deprecated recvLine() with readLine(). diff -r fce5b4150c09 -r 96b8799a565a netdata_tsrelay.nim --- a/netdata_tsrelay.nim Tue Nov 06 15:54:05 2018 -0800 +++ b/netdata_tsrelay.nim Mon Nov 19 12:05:47 2018 -0800 @@ -46,7 +46,7 @@ const VERSION = "v0.2.0" USAGE = """ -./netdata_tsrelay [-q][-v][-h] --dbopts="[PostgreSQL connection string]" --listen-port=14866 --listen-addr=0.0.0.0 +./netdata_tsrelay [-d][-h][-q][-t][-T][-v] --dbopts="[PostgreSQL connection string]" --listen-port=14866 --listen-addr=0.0.0.0 -q: Quiet mode. No output at all. Ignored if -d is supplied. -d: Debug: Show incoming and parsed data. @@ -94,15 +94,13 @@ proc fetch_data( client: Socket ): string = ## Netdata JSON backend doesn't send a length, so we read line by ## line and wait for stream timeout to determine a "sample". - var buf: string = "" + var buf = "" try: - result = client.recv_line( timeout=conf.timeout ) - if result != "": result = result & "\n" - while buf != "": - buf = client.recv_line( timeout=conf.timeout ) + while true: + client.readline( buf, timeout=conf.timeout ) if buf != "": result = result & buf & "\n" except TimeoutError: - discard + return proc parse_data( data: string ): seq[ JsonNode ] =