From 8fc8c985d8676e6aa330d437fc483a573240e4cf Mon Sep 17 00:00:00 2001 From: hroff-1902 <47309513+hroff-1902@users.noreply.github.com> Date: Wed, 13 Feb 2019 12:38:44 +0300 Subject: [PATCH 1/3] logs: cosmetic changes "30 seconds" was errorneously hardcoded in the text of the log message, while actually it's RETRY_TIMEOUT which may differ --- freqtrade/freqtradebot.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/freqtrade/freqtradebot.py b/freqtrade/freqtradebot.py index 5413c57f9..9c211608f 100644 --- a/freqtrade/freqtradebot.py +++ b/freqtrade/freqtradebot.py @@ -191,7 +191,7 @@ class FreqtradeBot(object): Trade.session.flush() except TemporaryError as error: - logger.warning('%s, retrying in 30 seconds...', error) + logger.warning(f"Error: {error}, retrying in {constants.RETRY_TIMEOUT} seconds...") time.sleep(constants.RETRY_TIMEOUT) except OperationalException: tb = traceback.format_exc() From 8e7e6700030214338e4b826a16100f43583f7ab3 Mon Sep 17 00:00:00 2001 From: hroff-1902 <47309513+hroff-1902@users.noreply.github.com> Date: Wed, 13 Feb 2019 12:42:39 +0300 Subject: [PATCH 2/3] Orthography in the log message --- freqtrade/strategy/interface.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/freqtrade/strategy/interface.py b/freqtrade/strategy/interface.py index bf05e1902..1d6147357 100644 --- a/freqtrade/strategy/interface.py +++ b/freqtrade/strategy/interface.py @@ -172,7 +172,7 @@ class IStrategy(ABC): dataframe = self.advise_sell(dataframe, metadata) self._last_candle_seen_per_pair[pair] = dataframe.iloc[-1]['date'] else: - logger.debug("Skippinig TA Analysis for already analyzed candle") + logger.debug("Skipping TA Analysis for already analyzed candle") dataframe['buy'] = 0 dataframe['sell'] = 0 From b87e15774b58f0206be1bca4ed6a902af73af61c Mon Sep 17 00:00:00 2001 From: hroff-1902 <47309513+hroff-1902@users.noreply.github.com> Date: Wed, 13 Feb 2019 13:02:57 +0300 Subject: [PATCH 3/3] test adjusted --- freqtrade/tests/strategy/test_interface.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/freqtrade/tests/strategy/test_interface.py b/freqtrade/tests/strategy/test_interface.py index f2e8c577f..d6ef0c8e7 100644 --- a/freqtrade/tests/strategy/test_interface.py +++ b/freqtrade/tests/strategy/test_interface.py @@ -204,7 +204,7 @@ def test_analyze_ticker_default(ticker_history, mocker, caplog) -> None: assert buy_mock.call_count == 1 assert log_has('TA Analysis Launched', caplog.record_tuples) - assert not log_has('Skippinig TA Analysis for already analyzed candle', + assert not log_has('Skipping TA Analysis for already analyzed candle', caplog.record_tuples) caplog.clear() @@ -214,7 +214,7 @@ def test_analyze_ticker_default(ticker_history, mocker, caplog) -> None: assert buy_mock.call_count == 2 assert buy_mock.call_count == 2 assert log_has('TA Analysis Launched', caplog.record_tuples) - assert not log_has('Skippinig TA Analysis for already analyzed candle', + assert not log_has('Skipping TA Analysis for already analyzed candle', caplog.record_tuples) @@ -242,7 +242,7 @@ def test_analyze_ticker_skip_analyze(ticker_history, mocker, caplog) -> None: assert buy_mock.call_count == 1 assert buy_mock.call_count == 1 assert log_has('TA Analysis Launched', caplog.record_tuples) - assert not log_has('Skippinig TA Analysis for already analyzed candle', + assert not log_has('Skipping TA Analysis for already analyzed candle', caplog.record_tuples) caplog.clear() @@ -257,5 +257,5 @@ def test_analyze_ticker_skip_analyze(ticker_history, mocker, caplog) -> None: assert ret['buy'].sum() == 0 assert ret['sell'].sum() == 0 assert not log_has('TA Analysis Launched', caplog.record_tuples) - assert log_has('Skippinig TA Analysis for already analyzed candle', + assert log_has('Skipping TA Analysis for already analyzed candle', caplog.record_tuples)