oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Handle announcer thread killing properly

Browse source
This commit is contained in:
shortcutme 2019-11-19 02:09:55 +01:00
parent 8f27f50b34
commit dd61429e2f
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/Site/SiteAnnouncer.py
View file

@ -10,6 +10,7 @@ from Plugin import PluginManager
from Config import config from Config import config
from Debug import Debug from Debug import Debug
from util import helper from util import helper
from greenlet import GreenletExit
import util import util
@ -105,7 +106,7 @@ class SiteAnnouncer(object):
gevent.joinall(threads, timeout=20) # Wait for announce finish gevent.joinall(threads, timeout=20) # Wait for announce finish
for thread in threads: for thread in threads:
if thread.value is None: if thread.value is None or type(thread.value) is GreenletExit:
continue continue
if thread.value is not False: if thread.value is not False:
if thread.value > 1.0: # Takes more than 1 second to announce if thread.value > 1.0: # Takes more than 1 second to announce