LBRYCommunity/lbcwallet
1
0
Fork 0
Code Issues 5 Pull requests Projects Releases 14 Packages Wiki Activity

Set connect option based on active net params.

Browse source
This commit is contained in:
Josh Rickmar 2013-12-09 16:46:38 -05:00
parent c97e0d5fc6
commit 9be84e3489
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
config.go
View file

@ -46,7 +46,7 @@ var (
type config struct { type config struct {
ShowVersion bool `short:"V" long:"version" description:"Display version information and exit"` ShowVersion bool `short:"V" long:"version" description:"Display version information and exit"`
CAFile string `long:"cafile" description:"File containing root certificates to authenticate a TLS connections with btcd"` CAFile string `long:"cafile" description:"File containing root certificates to authenticate a TLS connections with btcd"`
Connect string `short:"c" long:"connect" description:"Server and port of btcd instance to connect to"` Connect string `short:"c" long:"connect" description:"Server and port of btcd instance to connect to (default localhost:18334, mainnet: localhost:8334)"`
DebugLevel string `short:"d" long:"debuglevel" description:"Logging level {trace, debug, info, warn, error, critical}"` DebugLevel string `short:"d" long:"debuglevel" description:"Logging level {trace, debug, info, warn, error, critical}"`
ConfigFile string `short:"C" long:"configfile" description:"Path to configuration file"` ConfigFile string `short:"C" long:"configfile" description:"Path to configuration file"`
SvrListeners []string `long:"listen" description:"Listen for RPC/websocket connections on this interface/port (default no listening. default port: 18332, mainnet: 8332)"` SvrListeners []string `long:"listen" description:"Listen for RPC/websocket connections on this interface/port (default no listening. default port: 18332, mainnet: 8332)"`
@ -138,7 +138,6 @@ func loadConfig() (*config, []string, error) {
DebugLevel: defaultLogLevel, DebugLevel: defaultLogLevel,
CAFile: defaultCAFile, CAFile: defaultCAFile,
ConfigFile: defaultConfigFile, ConfigFile: defaultConfigFile,
Connect: netParams(defaultBtcNet).connect,
DataDir: defaultDataDir, DataDir: defaultDataDir,
RPCKey: defaultRPCKeyFile, RPCKey: defaultRPCKeyFile,
RPCCert: defaultRPCCertFile, RPCCert: defaultRPCCertFile,
@ -212,6 +211,10 @@ func loadConfig() (*config, []string, error) {
return nil, nil, err return nil, nil, err
} }
if cfg.Connect == "" {
cfg.Connect = activeNetParams.connect
}
// Add default port to connect flag if missing. // Add default port to connect flag if missing.
cfg.Connect = normalizeAddress(cfg.Connect, activeNetParams.btcdPort) cfg.Connect = normalizeAddress(cfg.Connect, activeNetParams.btcdPort)
@ -227,11 +230,6 @@ func loadConfig() (*config, []string, error) {
} }
} }
// Add default port to all listener addresses if needed and remove
// duplicate addresses.
cfg.SvrListeners = normalizeAddresses(cfg.SvrListeners,
activeNetParams.svrPort)
// Add default port to all rpc listener addresses if needed and remove // Add default port to all rpc listener addresses if needed and remove
// duplicate addresses. // duplicate addresses.
cfg.SvrListeners = normalizeAddresses(cfg.SvrListeners, cfg.SvrListeners = normalizeAddresses(cfg.SvrListeners,