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

Shell: improve termination

Browse Source 
Kill the `DistributedDB` before anything else.
This commit is contained in:
Grégoire Henry 2019-02-20 15:34:46 +01:00
parent 359f2d6932
commit c80ab66397
No known key found for this signature in database
GPG Key ID: 50D984F20BD445D2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/lib_shell/distributed_db.ml
View File

@ -910,7 +910,7 @@ let disconnect { global_db = { p2p } } peer_id =
| None -> Lwt.return_unit | None -> Lwt.return_unit
| Some conn -> P2p.disconnect p2p conn | Some conn -> P2p.disconnect p2p conn
let shutdown { p2p ; p2p_readers ; active_chains } = let shutdown { p2p_readers ; active_chains } =
P2p_peer.Table.fold P2p_peer.Table.fold
(fun _peer_id reader acc -> (fun _peer_id reader acc ->
P2p_reader.shutdown reader >>= fun () -> acc) P2p_reader.shutdown reader >>= fun () -> acc)
@ -923,7 +923,6 @@ let shutdown { p2p ; p2p_readers ; active_chains } =
acc) acc)
active_chains active_chains
Lwt.return_unit >>= fun () -> Lwt.return_unit >>= fun () ->
P2p.shutdown p2p >>= fun () ->
Lwt.return_unit Lwt.return_unit
let clear_block chain_db hash n = let clear_block chain_db hash n =

1
src/lib_shell/node.ml
View File

@ -205,6 +205,7 @@ let create
?max_child_ttl ~start_prevalidator mainchain_state >>=? fun mainchain_validator -> ?max_child_ttl ~start_prevalidator mainchain_state >>=? fun mainchain_validator ->
let shutdown () = let shutdown () =
P2p.shutdown p2p >>= fun () -> P2p.shutdown p2p >>= fun () ->
Distributed_db.shutdown distributed_db >>= fun () ->
Validator.shutdown validator >>= fun () -> Validator.shutdown validator >>= fun () ->
State.close state >>= fun () -> State.close state >>= fun () ->
Lwt.return_unit Lwt.return_unit