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

Cosmetic: fix logging

Browse Source 
Output stake_amount as it is defined in the config (it may by int) instead of float. In order to avoid unnecessary questions where and why it was converted to float and changed in the last digit while it should be integer for the exchange...

Other small cosmetic improvements to logging in freqtradebot.py
This commit is contained in:
hroff-1902 2019-02-10 21:31:13 +03:00 committed by GitHub
parent 58bd272c0f
commit b91981f0aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
freqtrade/freqtradebot.py
View File

@ -267,9 +267,8 @@ class FreqtradeBot(object):
# Check if stake_amount is fulfilled # Check if stake_amount is fulfilled
if avaliable_amount < stake_amount: if avaliable_amount < stake_amount:
raise DependencyException( raise DependencyException(
'Available balance(%f %s) is lower than stake amount(%f %s)' % ( f'Available balance({avaliable_amount} {self.config['stake_currency']}) is lower than '
avaliable_amount, self.config['stake_currency'], f'stake amount({stake_amount} {self.config['stake_currency']})'
stake_amount, self.config['stake_currency'])
) )
return stake_amount return stake_amount
@ -333,10 +332,7 @@ class FreqtradeBot(object):
if not stake_amount: if not stake_amount:
return False return False
logger.info( logger.info(f'Buy signal found: about create a new trade with stake_amount: {stake_amount} ...')
'Buy signal found: about create a new trade with stake_amount: %f ...',
stake_amount
)
bidstrat_check_depth_of_market = self.config.get('bid_strategy', {}).\ bidstrat_check_depth_of_market = self.config.get('bid_strategy', {}).\
get('check_depth_of_market', {}) get('check_depth_of_market', {})
@ -388,8 +384,8 @@ class FreqtradeBot(object):
min_stake_amount = self._get_min_pair_stake_amount(pair_s, buy_limit_requested) min_stake_amount = self._get_min_pair_stake_amount(pair_s, buy_limit_requested)
if min_stake_amount is not None and min_stake_amount > stake_amount: if min_stake_amount is not None and min_stake_amount > stake_amount:
logger.warning( logger.warning(
f'Can\'t open a new trade for {pair_s}: stake amount' f'Can\'t open a new trade for {pair_s}: stake amount '
f' is too small ({stake_amount} < {min_stake_amount})' f'is too small ({stake_amount} < {min_stake_amount})'
) )
return False return False
@ -507,7 +503,7 @@ class FreqtradeBot(object):
trade.fee_open = 0 trade.fee_open = 0
except OperationalException as exception: except OperationalException as exception:
logger.warning("could not update trade amount: %s", exception) logger.warning("Could not update trade amount: %s", exception)
trade.update(order) trade.update(order)
@ -566,12 +562,12 @@ class FreqtradeBot(object):
fee_abs += exectrade['fee']['cost'] fee_abs += exectrade['fee']['cost']
if amount != order_amount: if amount != order_amount:
logger.warning(f"amount {amount} does not match amount {trade.amount}") logger.warning(f"Amount {amount} does not match amount {trade.amount}")
raise OperationalException("Half bought? Amounts don't match") raise OperationalException("Half bought? Amounts don't match")
real_amount = amount - fee_abs real_amount = amount - fee_abs
if fee_abs != 0: if fee_abs != 0:
logger.info(f"""Applying fee on amount for {trade} \ logger.info(f"Applying fee on amount for {trade} "
(from {order_amount} to {real_amount}) from Trades""") f"(from {order_amount} to {real_amount}) from Trades")
return real_amount return real_amount
def handle_trade(self, trade: Trade) -> bool: def handle_trade(self, trade: Trade) -> bool:
@ -580,7 +576,7 @@ class FreqtradeBot(object):
:return: True if trade has been sold, False otherwise :return: True if trade has been sold, False otherwise
""" """
if not trade.is_open: if not trade.is_open:
raise ValueError(f'attempt to handle closed trade: {trade}') raise ValueError(f'Attempt to handle closed trade: {trade}')
logger.debug('Handling %s ...', trade) logger.debug('Handling %s ...', trade)
sell_rate = self.exchange.get_ticker(trade.pair)['bid'] sell_rate = self.exchange.get_ticker(trade.pair)['bid']