adelorenzo/stable
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1896 from hroff-1902/fix-help-traceback

Browse Source 
fix handling of SystemExit
This commit is contained in:
Matthias 2019-05-30 20:14:08 +02:00 committed by GitHub
commit f15f03428e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
freqtrade/main.py
View File

@ -12,7 +12,7 @@ if sys.version_info < (3, 6):
# flake8: noqa E402 # flake8: noqa E402
import logging import logging
from argparse import Namespace from argparse import Namespace
from typing import List from typing import Any, List
from freqtrade import OperationalException from freqtrade import OperationalException
from freqtrade.arguments import Arguments from freqtrade.arguments import Arguments
@ -29,12 +29,11 @@ def main(sysargv: List[str] = None) -> None:
:return: None :return: None
""" """
return_code: Any = 1
worker = None
try: try:
set_loggers() set_loggers()
worker = None
return_code = 1
arguments = Arguments( arguments = Arguments(
sysargv, sysargv,
'Free, open source crypto trading bot' 'Free, open source crypto trading bot'
@ -52,13 +51,15 @@ def main(sysargv: List[str] = None) -> None:
worker = Worker(args) worker = Worker(args)
worker.run() worker.run()
except SystemExit as e:
return_code = e
except KeyboardInterrupt: except KeyboardInterrupt:
logger.info('SIGINT received, aborting ...') logger.info('SIGINT received, aborting ...')
return_code = 0 return_code = 0
except OperationalException as e: except OperationalException as e:
logger.error(str(e)) logger.error(str(e))
return_code = 2 return_code = 2
except BaseException: except Exception:
logger.exception('Fatal exception!') logger.exception('Fatal exception!')
finally: finally:
if worker: if worker: