kylefang/stacks-puppet-node
1
0
Fork 0
mirror of https://github.com/alexgo-io/stacks-puppet-node.git synced 2026-06-15 09:07:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Properly handle HTTPS detection vis a vis command-line and config file

Browse Source 
arguments
This commit is contained in:
Jude Nelson
2015-07-28 16:52:17 -04:00
parent 563af521ae
commit c0c480309f
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
blockstore/lib/blockdaemon.py
View File

@@ -313,14 +313,18 @@ def parse_bitcoind_args( return_parser=False, parser=None ):
args, _ = parser.parse_known_args()
# propagate options
for (argname, config_name) in zip( ["bitcoind_server", "bitcoind_port", "bitcoind_user", "bitcoind_passwd", "bitcoind_use_https"], \
["BITCOIND_SERVER", "BITCOIND_PORT", "BITCOIND_USER", "BITCOIND_PASSWD", "BITCOIND_USE_HTTPS"] ):
for (argname, config_name) in zip( ["bitcoind_server", "bitcoind_port", "bitcoind_user", "bitcoind_passwd"], \
["BITCOIND_SERVER", "BITCOIND_PORT", "BITCOIND_USER", "BITCOIND_PASSWD"] ):
if hasattr( args, argname ) and getattr( args, argname ) is not None:
opts[ argname ] = getattr( args, argname )
setattr( config, config_name, getattr( args, argname ) )
if args.bitcoind_use_https:
config.BITCOIND_USE_HTTPS = True
opts['bitcoind_use_https'] = True
if return_parser:
return opts, parser
else: