balsoft/ligo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

P2p: fix logging

Browse Source
This commit is contained in:
Vincent Bernardoff 2016-11-16 14:06:51 +01:00 committed by Grégoire Henry
parent f7e73a6dc5
commit 2680bf7efb
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/node/net/p2p.ml
View File

@ -406,7 +406,7 @@ module Make (P: PARAMS) = struct
pick [ (LU.sleep limits.peer_answer_timeout >>= fun () -> return Disconnect) ; pick [ (LU.sleep limits.peer_answer_timeout >>= fun () -> return Disconnect) ;
recv_msg socket buf ] >>= function recv_msg socket buf ] >>= function
| Connect { gid; port = listening_port; versions ; public_key ; nonce } -> | Connect { gid; port = listening_port; versions ; public_key ; nonce } ->
debug "(%a) connection requested from %a @ %a:%d" debug "(%a) connection requested from %a @@ %a:%d"
pp_gid my_gid pp_gid gid Ipaddr.pp_hum addr port ; pp_gid my_gid pp_gid gid Ipaddr.pp_hum addr port ;
begin match common_version P.supported_versions versions with begin match common_version P.supported_versions versions with
| None -> | None ->
@ -479,7 +479,7 @@ module Make (P: PARAMS) = struct
match packet with match packet with
| Connect _ | Connect _
| Disconnect -> | Disconnect ->
debug "(%a) disconnected (by peer) %a @ %a:%d" debug "(%a) disconnected (by peer) %a @@ %a:%d"
pp_gid my_gid pp_gid gid Ipaddr.pp_hum addr port ; pp_gid my_gid pp_gid gid Ipaddr.pp_hum addr port ;
cancel () cancel ()
| Bootstrap -> push (Bootstrap peer) ; receiver () | Bootstrap -> push (Bootstrap peer) ; receiver ()
@ -887,20 +887,20 @@ module Make (P: PARAMS) = struct
let uaddr = Ipaddr_unix.to_inet_addr addr in let uaddr = Ipaddr_unix.to_inet_addr addr in
catch catch
(fun () -> (fun () ->
lwt_debug "Trying to connect to %a:%d" debug "(%a) trying to connect to %a:%d"
Ipaddr.pp_hum addr port >>= fun () -> pp_gid my_gid Ipaddr.pp_hum addr port;
Lwt.pick Lwt.pick
[ (Lwt_unix.sleep 2.0 >>= fun _ -> Lwt.fail Not_found) ; [ (Lwt_unix.sleep 2.0 >>= fun _ -> Lwt.fail Not_found) ;
LU.connect socket (LU.ADDR_INET (uaddr, port)) LU.connect socket (LU.ADDR_INET (uaddr, port))
] >>= fun () -> ] >>= fun () ->
lwt_debug "Connected to %a:%d" debug "(%a) connected to %a:%d"
Ipaddr.pp_hum addr port >>= fun () -> pp_gid my_gid Ipaddr.pp_hum addr port;
enqueue_event (Contact ((addr, port), socket)) ; enqueue_event (Contact ((addr, port), socket)) ;
return (nb - 1)) return (nb - 1))
(fun exn -> (fun exn ->
lwt_debug "Connection failed to %a:%d (%s)" debug "(%a) connection failed to %a:%d (%s)"
Ipaddr.pp_hum addr port pp_gid my_gid Ipaddr.pp_hum addr port
(string_of_unix_exn exn) >>= fun () -> (string_of_unix_exn exn);
(* if we didn't succes, we greylist it *) (* if we didn't succes, we greylist it *)
let now = Unix.gettimeofday () in let now = Unix.gettimeofday () in
known_peers := known_peers :=