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

node_main: do not override cfg file values

Browse Source
This commit is contained in:
Vincent Bernardoff 2016-12-05 17:55:09 +01:00
parent 9ece98167a
commit 4e9c54efa9
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/node_main.ml
View File

@ -243,19 +243,19 @@ module Cmdline = struct
(* net args *) (* net args *)
let min_connections = let min_connections =
let doc = "The number of connections below which aggressive peer discovery mode is entered." in let doc = "The number of connections below which aggressive peer discovery mode is entered." in
Arg.(value & opt int default_cfg.min_connections & info ~docs:"NETWORK" ~doc ~docv:"NUM" ["min-connections"]) Arg.(value & opt (some int) None & info ~docs:"NETWORK" ~doc ~docv:"NUM" ["min-connections"])
let max_connections = let max_connections =
let doc = "The number of connections above which some connections will be closed." in let doc = "The number of connections above which some connections will be closed." in
Arg.(value & opt int default_cfg.max_connections & info ~docs:"NETWORK" ~doc ~docv:"NUM" ["max-connections"]) Arg.(value & opt (some int) None & info ~docs:"NETWORK" ~doc ~docv:"NUM" ["max-connections"])
let expected_connections = let expected_connections =
let doc = "The minimum number of connections to be ensured by the cruise control." in let doc = "The minimum number of connections to be ensured by the cruise control." in
Arg.(value & opt int default_cfg.expected_connections & info ~docs:"NETWORK" ~doc ~docv:"NUM" ["expected-connections"]) Arg.(value & opt (some int) None & info ~docs:"NETWORK" ~doc ~docv:"NUM" ["expected-connections"])
let net_addr = let net_addr =
let doc = "The TCP address and port at which this instance can be reached." in let doc = "The TCP address and port at which this instance can be reached." in
Arg.(value & opt sockaddr_converter (default_cfg.net_addr, default_cfg.net_port) & info ~docs:"NETWORK" ~doc ~docv:"ADDR:PORT" ["net-addr"]) Arg.(value & opt (some sockaddr_converter) None & info ~docs:"NETWORK" ~doc ~docv:"ADDR:PORT" ["net-addr"])
let local_discovery = let local_discovery =
let doc = "Automatic discovery of peers on the local network." in let doc = "Automatic discovery of peers on the local network." in
Arg.(value & opt (some int) default_cfg.local_discovery & info ~docs:"NETWORK" ~doc ~docv:"ADDR:PORT" ["local-discovery"]) Arg.(value & opt (some int) None & info ~docs:"NETWORK" ~doc ~docv:"ADDR:PORT" ["local-discovery"])
let peers = let peers =
let doc = "A peer to bootstrap the network from. Can be used several times to add several peers." in let doc = "A peer to bootstrap the network from. Can be used several times to add several peers." in
Arg.(value & opt_all sockaddr_converter [] & info ~docs:"NETWORK" ~doc ~docv:"ADDR:PORT" ["peer"]) Arg.(value & opt_all sockaddr_converter [] & info ~docs:"NETWORK" ~doc ~docv:"ADDR:PORT" ["peer"])
@ -276,7 +276,7 @@ module Cmdline = struct
let parse base_dir config_file sandbox sandbox_param log_level let parse base_dir config_file sandbox sandbox_param log_level
min_connections max_connections expected_connections min_connections max_connections expected_connections
(net_addr, net_port) local_discovery peers closed rpc_addr reset_cfg update_cfg = net_saddr local_discovery peers closed rpc_addr reset_cfg update_cfg =
let base_dir = Utils.(unopt (unopt default_cfg.base_dir base_dir) sandbox) in let base_dir = Utils.(unopt (unopt default_cfg.base_dir base_dir) sandbox) in
let config_file = Utils.(unopt ((unopt base_dir sandbox) // "config")) config_file in let config_file = Utils.(unopt ((unopt base_dir sandbox) // "config")) config_file in
let no_config () = let no_config () =
@ -305,17 +305,17 @@ module Cmdline = struct
let cfg = let cfg =
{ cfg with { cfg with
base_dir ; base_dir ;
sandbox ; sandbox = Utils.first_some sandbox cfg.sandbox ;
sandbox_param ; sandbox_param = Utils.first_some sandbox_param cfg.sandbox_param ;
log_level ; log_level = Utils.first_some log_level cfg.log_level ;
min_connections ; min_connections = Utils.unopt cfg.min_connections min_connections ;
max_connections ; max_connections = Utils.unopt cfg.max_connections max_connections ;
expected_connections ; expected_connections = Utils.unopt cfg.expected_connections expected_connections ;
net_addr ; net_addr = (match net_saddr with None -> cfg.net_addr | Some (addr, _) -> addr) ;
net_port ; net_port = (match net_saddr with None -> cfg.net_port | Some (_, port) -> port) ;
local_discovery ; local_discovery = Utils.first_some local_discovery cfg.local_discovery ;
peers = List.rev_append peers cfg.peers ; peers = (match peers with [] -> cfg.peers | _ -> peers) ;
closed ; closed = closed || cfg.closed ;
rpc_addr = Utils.first_some rpc_addr cfg.rpc_addr ; rpc_addr = Utils.first_some rpc_addr cfg.rpc_addr ;
log_output = cfg.log_output ; log_output = cfg.log_output ;
} }