dxs/onionr
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix bug involving runcheck

Browse source
This commit is contained in:
Arinerron 2018-05-01 23:50:29 -07:00
parent 0a7c3aeaab
commit 7973d7c8a6
No known key found for this signature in database
GPG key ID: 99383627861C62F0
3 changed files with 22 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

31
onionr/onionrutils.py
View file

@ -400,21 +400,24 @@ class OnionrUtils:
retData = row[0]
return retData
def isCommunicatorRunning(timeout = 5, interval = 0.1):
runcheck_file = 'data/.runcheck'
def isCommunicatorRunning(self, timeout = 5, interval = 0.1):
try:
runcheck_file = 'data/.runcheck'
if os.path.isfile(runcheck_file):
os.remove(runcheck_file)
logger.debug('%s file appears to have existed before the run check.' % runcheck_file, timestamp = False)
self._core.daemonQueueAdd('runCheck')
starttime = time.time()
while True:
time.sleep(interval)
if os.path.isfile(runcheck_file):
os.remove(runcheck_file)
logger.debug('%s file appears to have existed before the run check.' % runcheck_file, timestamp = False)
return True
elif starttime - time.time() >= timeout:
return False
self._core.daemonQueueAdd('runCheck')
starttime = time.time()
while True:
time.sleep(interval)
if os.path.isfile(runcheck_file):
os.remove(runcheck_file)
return True
elif time.time() - starttime >= timeout:
return False
except:
return False