seasharp/basicswap_miserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Start XMR daemons in --non-interactive mode.

Browse Source
This commit is contained in:
tecnovert 2021-01-05 10:23:30 +02:00
parent 4711e81ffc
commit b473d9ffc3
No known key found for this signature in database
GPG Key ID: 8ED6D8750C4E3F93
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bin/basicswap_run.py
View File

@ -46,17 +46,21 @@ def startDaemon(node_dir, bin_dir, daemon_bin, opts=[]):
def startXmrDaemon(node_dir, bin_dir, daemon_bin, opts=[]):
daemon_bin = os.path.expanduser(os.path.join(bin_dir, daemon_bin))
args = [daemon_bin, '--config-file=' + os.path.join(os.path.expanduser(node_dir), 'monerod.conf')] + opts
data_dir = os.path.expanduser(node_dir)
args = [daemon_bin, '--non-interactive', '--config-file=' + os.path.join(data_dir, 'monerod.conf')] + opts
logging.info('Starting node {} --data-dir={}'.format(daemon_bin, node_dir))
return subprocess.Popen(args, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
# return subprocess.Popen(args, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
file_stdout = open(os.path.join(data_dir, 'core_stdout.log'), 'w')
file_stderr = open(os.path.join(data_dir, 'core_stderr.log'), 'w')
return subprocess.Popen(args, stdin=subprocess.PIPE, stdout=file_stdout, stderr=file_stderr)
def startXmrWalletDaemon(node_dir, bin_dir, wallet_bin, opts=[]):
daemon_bin = os.path.expanduser(os.path.join(bin_dir, wallet_bin))
data_dir = os.path.expanduser(node_dir)
args = [daemon_bin, '--config-file=' + os.path.join(os.path.expanduser(node_dir), 'monero_wallet.conf')] + opts
args = [daemon_bin, '--non-interactive', '--config-file=' + os.path.join(data_dir, 'monero_wallet.conf')] + opts
args += opts
logging.info('Starting wallet daemon {} --wallet-dir={}'.format(daemon_bin, node_dir))

2
docker/production/monero_daemon/Dockerfile
View File

@ -22,4 +22,4 @@ COPY entrypoint.sh /entrypoint.sh
ENTRYPOINT ["/entrypoint.sh"]
EXPOSE 18080
CMD ["monerod", "--config-file=/home/monero/.monero/monerod.conf"]
CMD ["monerod", "--non-interactive", "--config-file=/home/monero/.monero/monerod.conf"]

2
docker/production/monero_wallet/Dockerfile
View File

@ -16,4 +16,4 @@ COPY entrypoint.sh /entrypoint.sh
ENTRYPOINT ["/entrypoint.sh"]
EXPOSE 18080
CMD ["monero-wallet-rpc", "--config-file=/home/monero/.monero/monerod.conf"]
CMD ["monero-wallet-rpc", "--non-interactive", "--config-file=/home/monero/.monero/monerod.conf"]