mirror of
https://github.com/basicswap/basicswap.git
synced 2024-12-23 03:49:25 +00:00
Workaround missing litecoin pid file on windows.
This commit is contained in:
parent
31ed5e7142
commit
31766508b4
3 changed files with 9 additions and 2 deletions
|
@ -423,6 +423,7 @@ class BasicSwap():
|
|||
'last_height_checked': last_height_checked,
|
||||
'use_segwit': chain_client_settings.get('use_segwit', False),
|
||||
'use_csv': chain_client_settings.get('use_csv', True),
|
||||
'core_version_group': chain_client_settings.get('core_version_group', 0),
|
||||
'pid': None,
|
||||
}
|
||||
|
||||
|
@ -445,6 +446,7 @@ class BasicSwap():
|
|||
self.log.debug('Reading %s rpc credentials from auth cookie %s', coin, authcookiepath)
|
||||
# Wait for daemon to start
|
||||
# Test pids to ensure authcookie is read for the correct process
|
||||
datadir_pid = -1
|
||||
for i in range(20):
|
||||
try:
|
||||
with open(pidfilepath, 'rb') as fp:
|
||||
|
@ -454,7 +456,8 @@ class BasicSwap():
|
|||
except Exception:
|
||||
time.sleep(0.5)
|
||||
try:
|
||||
assert(datadir_pid == cc['pid'])
|
||||
if os.name != 'nt' or cc['core_version_group'] > 17: # litecoin on windows doesn't write a pid file
|
||||
assert(datadir_pid == cc['pid'])
|
||||
with open(authcookiepath, 'rb') as fp:
|
||||
cc['rpcauth'] = fp.read().decode('utf-8')
|
||||
except Exception:
|
||||
|
|
|
@ -381,6 +381,7 @@ def main():
|
|||
'blocks_confirmed': 2,
|
||||
'override_feerate': 0.002,
|
||||
'conf_target': 2,
|
||||
'core_version_group': 18,
|
||||
},
|
||||
'litecoin': {
|
||||
'connection_type': 'rpc' if 'litecoin' in with_coins else 'none',
|
||||
|
@ -391,6 +392,7 @@ def main():
|
|||
'use_segwit': True,
|
||||
'blocks_confirmed': 2,
|
||||
'conf_target': 2,
|
||||
'core_version_group': 17,
|
||||
},
|
||||
'bitcoin': {
|
||||
'connection_type': 'rpc' if 'bitcoin' in with_coins else 'none',
|
||||
|
@ -401,6 +403,7 @@ def main():
|
|||
'use_segwit': True,
|
||||
'blocks_confirmed': 1,
|
||||
'conf_target': 2,
|
||||
'core_version_group': 18,
|
||||
},
|
||||
'namecoin': {
|
||||
'connection_type': 'rpc' if 'namecoin' in with_coins else 'none',
|
||||
|
@ -412,6 +415,7 @@ def main():
|
|||
'use_csv': False,
|
||||
'blocks_confirmed': 1,
|
||||
'conf_target': 2,
|
||||
'core_version_group': 18,
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -20,7 +20,7 @@ import subprocess
|
|||
import logging
|
||||
|
||||
from basicswap import __version__
|
||||
from basicswap.basicswap import BasicSwap, Coins
|
||||
from basicswap.basicswap import BasicSwap
|
||||
from basicswap.http_server import HttpThread
|
||||
|
||||
|
||||
|
|
Loading…
Reference in a new issue