reynir/albatross
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

vmm_influxd_stats: more safety

Browse source
This commit is contained in:
Hannes Mehnert 2018-05-05 12:49:42 +02:00
parent 791752f2b9
commit 3017adb6c4
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/vmm_influxdb_stats.ml
View file

@ -178,11 +178,11 @@ let rec read_sock_write_tcp db c ?fd addr addrtype =
| Error e ->
Logs.err (fun m -> m "error %s while reading vmm socket (return)"
(str_of_e e)) ;
Lwt.return_unit
safe_close fd
| Ok (hdr, data) ->
if not (version_eq hdr.version my_version) then begin
Logs.err (fun m -> m "unknown wire protocol version") ;
Lwt.return_unit
safe_close fd
end else
let name = IM.find hdr.id !req in
req := IM.remove hdr.id !req ;
@ -256,10 +256,10 @@ let client stat_socket influxhost influxport db prefix interval =
(* loop *)
let rec loop c =
Lwt.catch (fun () ->
Lwt.pick [
query_sock prefix db c interval ;
read_sock_write_tcp db c addr addrtype
])
Lwt.pick [ query_sock prefix db c interval ; read_sock_write_tcp db c addr addrtype ] >>= fun () ->
safe_close c >>= fun () ->
maybe_connect stat_socket >>= fun c ->
loop c)
(fun _ ->
safe_close c >>= fun () ->
maybe_connect stat_socket >>= fun c ->