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-15 16:27:34 +01:00 committed by Grégoire Henry
parent 6121c518d4
commit 23968b53e3
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -381,7 +381,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 } -> | Connect { gid; port = listening_port; versions } ->
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 ->
@ -437,7 +437,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 ()
@ -960,13 +960,13 @@ module Make (P: PARAMS) = struct
end end
(* keep only one connection to each node by checking its gid *) (* keep only one connection to each node by checking its gid *)
else if PeerMap.mem_by_gid peer.gid !connected then begin else if PeerMap.mem_by_gid peer.gid !connected then begin
debug "(%a) rejected already connected peer %a @ %a:%d" debug "(%a) rejected already connected peer %a @@ %a:%d"
pp_gid my_gid pp_gid peer.gid pp_gid my_gid pp_gid peer.gid
Ipaddr.pp_hum (fst peer.point) (snd peer.point) ; Ipaddr.pp_hum (fst peer.point) (snd peer.point) ;
update_infos () ; update_infos () ;
Lwt.async peer.disconnect Lwt.async peer.disconnect
end else begin end else begin
debug "(%a) connected peer %a @ %a:%d" debug "(%a) connected peer %a @@ %a:%d"
pp_gid my_gid pp_gid peer.gid pp_gid my_gid pp_gid peer.gid
Ipaddr.pp_hum (fst peer.point) (snd peer.point) ; Ipaddr.pp_hum (fst peer.point) (snd peer.point) ;
update_infos () ; update_infos () ;
@ -988,7 +988,7 @@ module Make (P: PARAMS) = struct
else else
let canceler = let canceler =
connect_to_peer config limits my_gid socket (addr, port) enqueue_event white_listed in connect_to_peer config limits my_gid socket (addr, port) enqueue_event white_listed in
debug "(%a) incoming peer at %a:%d" debug "(%a) incoming peer @@ %a:%d"
pp_gid my_gid Ipaddr.pp_hum addr port ; pp_gid my_gid Ipaddr.pp_hum addr port ;
incoming := PointMap.add (addr, port) canceler !incoming ; incoming := PointMap.add (addr, port) canceler !incoming ;
main () main ()