aljaz/python-teos
1
0
Fork 0
mirror of https://github.com/aljazceru/python-teos.git synced 2025-12-17 14:14:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #144 from talaia-labs/cmd_params_hotfix

Browse Source 
Fixes cmd parameters edge cases
This commit is contained in:
Sergi Delgado Segura
2020-05-08 20:02:33 +02:00
committed by GitHub
parent 1a8bdad3f3 cdf8a94284
commit 8a9e985362
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cli/teos_cli.py
View File

@@ -484,7 +484,7 @@ if __name__ == "__main__":
if opt in ["-h", "--help"]: if opt in ["-h", "--help"]:
sys.exit(show_usage()) sys.exit(show_usage())
command = args.pop(0) command = args.pop(0) if args else None
if command in commands: if command in commands:
main(command, args, command_line_conf) main(command, args, command_line_conf)
elif not command: elif not command:

9
teos/teosd.py
View File

@@ -43,7 +43,7 @@ def main(command_line_conf):
signal(SIGQUIT, handle_signals) signal(SIGQUIT, handle_signals)
# Loads config and sets up the data folder and log file # Loads config and sets up the data folder and log file
data_dir = command_line_conf.get("DATA_DIR") if "DATA_DIR" in command_line_conf else DATA_DIR data_dir = command_line_conf.pop("DATA_DIR") if "DATA_DIR" in command_line_conf else DATA_DIR
config_loader = ConfigLoader(data_dir, CONF_FILE_NAME, DEFAULT_CONF, command_line_conf) config_loader = ConfigLoader(data_dir, CONF_FILE_NAME, DEFAULT_CONF, command_line_conf)
config = config_loader.build_config() config = config_loader.build_config()
setup_data_folder(data_dir) setup_data_folder(data_dir)
@@ -173,7 +173,7 @@ if __name__ == "__main__":
argv[1:], argv[1:],
"h", "h",
[ [
"apiconnect=", "apibind=",
"apiport=", "apiport=",
"btcnetwork=", "btcnetwork=",
"btcrpcuser=", "btcrpcuser=",
@@ -188,7 +188,10 @@ if __name__ == "__main__":
if opt in ["--apibind"]: if opt in ["--apibind"]:
command_line_conf["API_BIND"] = arg command_line_conf["API_BIND"] = arg
if opt in ["--apiport"]: if opt in ["--apiport"]:
command_line_conf["API_PORT"] = arg try:
command_line_conf["API_PORT"] = int(arg)
except ValueError:
exit("apiport must be an integer")
if opt in ["--btcnetwork"]: if opt in ["--btcnetwork"]:
command_line_conf["BTC_NETWORK"] = arg command_line_conf["BTC_NETWORK"] = arg
if opt in ["--btcrpcuser"]: if opt in ["--btcrpcuser"]: