Ecosystem/basicswap
1
0
Fork 0
mirror of https://github.com/basicswap/basicswap.git synced 2025-01-03 17:29:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add timeout to docker, use logging in launcher.

Browse source
This commit is contained in:
tecnovert 2019-07-18 23:00:08 +02:00
parent 818b5f1ab2
commit b0f2e0557a
No known key found for this signature in database
GPG key ID: 13F13651C9CF0D6B
2 changed files with 22 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
bin/basicswap_run.py
View file

@ -20,6 +20,7 @@ import json
import traceback import traceback
import signal import signal
import subprocess import subprocess
import logging
import basicswap.config as cfg import basicswap.config as cfg
from basicswap import __version__ from basicswap import __version__
@ -27,12 +28,16 @@ from basicswap.basicswap import BasicSwap
from basicswap.http_server import HttpThread from basicswap.http_server import HttpThread
logger = logging.getLogger()
logger.level = logging.DEBUG
logger.addHandler(logging.StreamHandler(sys.stdout))
ALLOW_CORS = False ALLOW_CORS = False
swap_client = None swap_client = None
def signal_handler(sig, frame): def signal_handler(sig, frame):
print('signal %d detected, ending program.' % (sig)) logger.info('Signal %d detected, ending program.' % (sig))
if swap_client is not None: if swap_client is not None:
swap_client.stopRunning() swap_client.stopRunning()
@ -41,7 +46,7 @@ def startDaemon(node_dir, bin_dir, daemon_bin):
daemon_bin = os.path.join(bin_dir, daemon_bin) daemon_bin = os.path.join(bin_dir, daemon_bin)
args = [daemon_bin, '-datadir=' + node_dir] args = [daemon_bin, '-datadir=' + node_dir]
print('Starting node ' + daemon_bin + ' ' + '-datadir=' + node_dir) logger.info('Starting node ' + daemon_bin + ' ' + '-datadir=' + 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)
@ -59,18 +64,18 @@ def runClient(fp, dataDir, chain):
for c, v in settings['chainclients'].items(): for c, v in settings['chainclients'].items():
if v['manage_daemon'] is True: if v['manage_daemon'] is True:
print('Starting {} daemon'.format(c.capitalize())) logger.info('Starting {} daemon'.format(c.capitalize()))
if c == 'particl': if c == 'particl':
daemons.append(startDaemon(v['datadir'], cfg.PARTICL_BINDIR, cfg.PARTICLD)) daemons.append(startDaemon(v['datadir'], cfg.PARTICL_BINDIR, cfg.PARTICLD))
print('Started {} {}'.format(cfg.PARTICLD, daemons[-1].pid)) logger.info('Started {} {}'.format(cfg.PARTICLD, daemons[-1].pid))
elif c == 'bitcoin': elif c == 'bitcoin':
daemons.append(startDaemon(v['datadir'], cfg.BITCOIN_BINDIR, cfg.BITCOIND)) daemons.append(startDaemon(v['datadir'], cfg.BITCOIN_BINDIR, cfg.BITCOIND))
print('Started {} {}'.format(cfg.BITCOIND, daemons[-1].pid)) logger.info('Started {} {}'.format(cfg.BITCOIND, daemons[-1].pid))
elif c == 'litecoin': elif c == 'litecoin':
daemons.append(startDaemon(v['datadir'], cfg.LITECOIN_BINDIR, cfg.LITECOIND)) daemons.append(startDaemon(v['datadir'], cfg.LITECOIN_BINDIR, cfg.LITECOIND))
print('Started {} {}'.format(cfg.LITECOIND, daemons[-1].pid)) logger.info('Started {} {}'.format(cfg.LITECOIND, daemons[-1].pid))
else: else:
print('Unknown chain', c) logger.warning('Unknown chain', c)
swap_client = BasicSwap(fp, dataDir, settings, chain) swap_client = BasicSwap(fp, dataDir, settings, chain)
@ -87,7 +92,7 @@ def runClient(fp, dataDir, chain):
tS1.start() tS1.start()
try: try:
print('Exit with Ctrl + c.') logger.info('Exit with Ctrl + c.')
while swap_client.is_running: while swap_client.is_running:
time.sleep(0.5) time.sleep(0.5)
swap_client.update() swap_client.update()
@ -100,7 +105,7 @@ def runClient(fp, dataDir, chain):
t.join() t.join()
for d in daemons: for d in daemons:
print('Terminating {}'.format(d.pid)) logger.info('Terminating {}'.format(d.pid))
d.terminate() d.terminate()
d.wait(timeout=120) d.wait(timeout=120)
if d.stdout: if d.stdout:
@ -112,11 +117,11 @@ def runClient(fp, dataDir, chain):
def printVersion(): def printVersion():
print('Basicswap version:', __version__) logger.info('Basicswap version:', __version__)
def printHelp(): def printHelp():
print('basicswap-run.py --datadir=path -testnet') logger.info('basicswap-run.py --datadir=path -testnet')
def main(): def main():
@ -125,7 +130,7 @@ def main():
for v in sys.argv[1:]: for v in sys.argv[1:]:
if len(v) < 2 or v[0] != '-': if len(v) < 2 or v[0] != '-':
print('Unknown argument', v) logger.warning('Unknown argument', v)
continue continue
s = v.split('=') s = v.split('=')
@ -153,23 +158,23 @@ def main():
data_dir = os.path.expanduser(s[1]) data_dir = os.path.expanduser(s[1])
continue continue
print('Unknown argument', v) logger.warning('Unknown argument', v)
if data_dir is None: if data_dir is None:
data_dir = os.path.join(os.path.expanduser(os.path.join(cfg.DATADIRS)), 'particl', ('' if chain == 'mainnet' else chain), 'basicswap') data_dir = os.path.join(os.path.expanduser(os.path.join(cfg.DATADIRS)), 'particl', ('' if chain == 'mainnet' else chain), 'basicswap')
print('data_dir:', data_dir) print('data_dir:', data_dir)
if chain != 'mainnet': if chain != 'mainnet':
print('chain:', chain) logger.info('chain:', chain)
if not os.path.exists(data_dir): if not os.path.exists(data_dir):
os.makedirs(data_dir) os.makedirs(data_dir)
with open(os.path.join(data_dir, 'basicswap.log'), 'a') as fp: with open(os.path.join(data_dir, 'basicswap.log'), 'a') as fp:
print(os.path.basename(sys.argv[0]) + ', version: ' + __version__ + '\n\n') logger.info(os.path.basename(sys.argv[0]) + ', version: ' + __version__ + '\n\n')
runClient(fp, data_dir, chain) runClient(fp, data_dir, chain)
print('Done.') logger.info('Done.')
return swap_client.fail_code if swap_client is not None else 0 return swap_client.fail_code if swap_client is not None else 0

1
docker/docker-compose.yml
View file

@ -2,6 +2,7 @@ version: '3'
services: services:
swapclient: swapclient:
stop_grace_period: 5m
build: build:
context: ../ context: ../
volumes: volumes: