Also set RPC port default from namecoin.conf
Also use the found rpcport in namecoin.conf to initialise the RPC port setting at first if it is not yet set.
This commit is contained in:
parent
810387df3e
commit
25f0192fd6
|
@ -240,11 +240,10 @@ def ensureNamecoinOptions ():
|
||||||
shared.config.set (configSection, "namecoinrpctype", "namecoind")
|
shared.config.set (configSection, "namecoinrpctype", "namecoind")
|
||||||
if not shared.config.has_option (configSection, "namecoinrpchost"):
|
if not shared.config.has_option (configSection, "namecoinrpchost"):
|
||||||
shared.config.set (configSection, "namecoinrpchost", "localhost")
|
shared.config.set (configSection, "namecoinrpchost", "localhost")
|
||||||
if not shared.config.has_option (configSection, "namecoinrpcport"):
|
|
||||||
shared.config.set (configSection, "namecoinrpcport", "8336")
|
|
||||||
|
|
||||||
hasUser = shared.config.has_option (configSection, "namecoinrpcuser")
|
hasUser = shared.config.has_option (configSection, "namecoinrpcuser")
|
||||||
hasPass = shared.config.has_option (configSection, "namecoinrpcpassword")
|
hasPass = shared.config.has_option (configSection, "namecoinrpcpassword")
|
||||||
|
hasPort = shared.config.has_option (configSection, "namecoinrpcport")
|
||||||
|
|
||||||
# Try to read user/password from .namecoin configuration file.
|
# Try to read user/password from .namecoin configuration file.
|
||||||
try:
|
try:
|
||||||
|
@ -269,6 +268,7 @@ def ensureNamecoinOptions ():
|
||||||
"namecoinrpcpassword", val)
|
"namecoinrpcpassword", val)
|
||||||
if key == "rpcport":
|
if key == "rpcport":
|
||||||
shared.namecoinDefaultRpcPort = val
|
shared.namecoinDefaultRpcPort = val
|
||||||
|
# Will be set in config below anyway.
|
||||||
|
|
||||||
nmc.close ()
|
nmc.close ()
|
||||||
|
|
||||||
|
@ -278,3 +278,8 @@ def ensureNamecoinOptions ():
|
||||||
shared.config.set (configSection, "namecoinrpcuser", "")
|
shared.config.set (configSection, "namecoinrpcuser", "")
|
||||||
if (not hasPass):
|
if (not hasPass):
|
||||||
shared.config.set (configSection, "namecoinrpcpassword", "")
|
shared.config.set (configSection, "namecoinrpcpassword", "")
|
||||||
|
|
||||||
|
# Set default port now, possibly to found value.
|
||||||
|
if (not hasPort):
|
||||||
|
shared.config.set (configSection, "namecoinrpcport",
|
||||||
|
shared.namecoinDefaultRpcPort)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user