Merge pull request #4 from vertti/remove_should_stop_global

Move _should_stop from module global to class variable
This commit is contained in:
Michael Egger 2017-09-01 20:09:32 +02:00 committed by GitHub
commit 6bd81f3a85
2 changed files with 25 additions and 24 deletions

45
main.py
View File

@ -27,27 +27,15 @@ CONFIG = get_conf()
api_wrapper = get_exchange_api(CONFIG)
@synchronized
def get_instance(recreate=False):
"""
Get the current instance of this thread. This is a singleton.
:param recreate: Must be True if you want to start the instance
:return: TradeThread instance
"""
global _instance, _should_stop
if recreate and not _instance.is_alive():
logger.debug('Creating TradeThread instance')
_should_stop = False
_instance = TradeThread()
return _instance
def stop_instance():
global _should_stop
_should_stop = True
class TradeThread(threading.Thread):
def __init__(self):
super().__init__()
self._should_stop = False
def stop(self):
""" stops the trader thread """
self._should_stop = True
def run(self):
"""
Threaded main function
@ -56,7 +44,7 @@ class TradeThread(threading.Thread):
try:
TelegramHandler.send_msg('*Status:* `trader started`')
logger.info('Trader started')
while not _should_stop:
while not self._should_stop:
try:
self._process()
except (ConnectionError, JSONDecodeError, ValueError) as error:
@ -113,7 +101,20 @@ class TradeThread(threading.Thread):
# Initial stopped TradeThread instance
_instance = TradeThread()
_should_stop = False
@synchronized
def get_instance(recreate=False):
"""
Get the current instance of this thread. This is a singleton.
:param recreate: Must be True if you want to start the instance
:return: TradeThread instance
"""
global _instance
if recreate and not _instance.is_alive():
logger.debug('Creating TradeThread instance')
_should_stop = False
_instance = TradeThread()
return _instance
def close_trade_if_fulfilled(trade):

View File

@ -174,10 +174,10 @@ class TelegramHandler(object):
:param update: message update
:return: None
"""
from main import get_instance, stop_instance
from main import get_instance
if get_instance().is_alive():
TelegramHandler.send_msg('`Stopping trader ...`', bot=bot)
stop_instance()
get_instance().stop()
else:
TelegramHandler.send_msg('*Status:* `already stopped`', bot=bot)