lychiyu/bbgo_origin
1
0
Fork 0
mirror of https://github.com/c9s/bbgo.git synced 2024-09-20 08:11:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cmd: fix debug flag loading and add debug log to cache function

Browse Source
This commit is contained in:
c9s 2021-12-23 23:02:07 +08:00
parent 168e6306e7
commit f5bbe29ac6
4 changed files with 32 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/backtest/exchange.go
View File

@ -291,7 +291,7 @@ func (e Exchange) PlatformFeeCurrency() string {
}
func (e Exchange) QueryMarkets(ctx context.Context) (types.MarketMap, error) {
return bbgo.LoadExchangeMarketsWithCache(ctx, e.publicExchange)
return e.markets, nil
}
func (e Exchange) QueryDepositHistory(ctx context.Context, asset string, since, until time.Time) (allDeposits []types.Deposit, err error) {

4
pkg/bbgo/cache.go
View File

@ -11,6 +11,7 @@ import (
"github.com/c9s/bbgo/pkg/types"
"github.com/pkg/errors"
log "github.com/sirupsen/logrus"
)
type DataFetcher func() (interface{}, error)
@ -24,6 +25,8 @@ func WithCache(key string, obj interface{}, fetcher DataFetcher) error {
cacheFile := path.Join(cacheDir, key+".json")
if _, err := os.Stat(cacheFile); os.IsNotExist(err) {
log.Debugf("cache %s not found, executing fetcher callback to get the data", cacheFile)
data, err := fetcher()
if err != nil {
return err
@ -46,6 +49,7 @@ func WithCache(key string, obj interface{}, fetcher DataFetcher) error {
rv.Set(reflect.ValueOf(data))
} else {
log.Debugf("cache %s found", cacheFile)
data, err := ioutil.ReadFile(cacheFile)
if err != nil {

31
pkg/cmd/backtest.go
View File

@ -20,6 +20,7 @@ import (
"github.com/pkg/errors"
log "github.com/sirupsen/logrus"
"github.com/spf13/cobra"
"github.com/spf13/viper"
)
func init() {
@ -47,6 +48,10 @@ var BacktestCmd = &cobra.Command{
return err
}
if viper.GetBool("debug") {
verboseCnt = 2
}
configFile, err := cmd.Flags().GetString("config")
if err != nil {
return err
@ -103,7 +108,16 @@ var BacktestCmd = &cobra.Command{
return err
}
//if it's declared in the cmd , use the cmd one first
if verboseCnt == 2 {
log.SetLevel(log.DebugLevel)
} else if verboseCnt > 0 {
log.SetLevel(log.InfoLevel)
} else {
// default mode, disable strategy logging and order executor logging
log.SetLevel(log.ErrorLevel)
}
// if it's declared in the cmd , use the cmd one first
if exchangeNameStr == "" {
exchangeNameStr = userConfig.Backtest.Session
}
@ -205,9 +219,9 @@ var BacktestCmd = &cobra.Command{
}
for interval := range supportIntervals {
//if err := s.SyncKLineByInterval(ctx, exchange, symbol, interval, startTime, endTime); err != nil {
// if err := s.SyncKLineByInterval(ctx, exchange, symbol, interval, startTime, endTime); err != nil {
// return err
//}
// }
firstKLine, err := backtestService.QueryFirstKLine(sourceExchange.Name(), symbol, interval)
if err != nil {
return errors.Wrapf(err, "failed to query backtest kline")
@ -262,7 +276,7 @@ var BacktestCmd = &cobra.Command{
environ.SetStartTime(startTime)
//exchangeNameStr is the session name.
// exchangeNameStr is the session name.
environ.AddExchange(exchangeNameStr, backtestExchange)
if err := environ.Init(ctx); err != nil {
@ -270,14 +284,7 @@ var BacktestCmd = &cobra.Command{
}
trader := bbgo.NewTrader(environ)
if verboseCnt == 2 {
log.SetLevel(log.DebugLevel)
} else if verboseCnt > 0 {
log.SetLevel(log.InfoLevel)
} else {
// default mode, disable strategy logging and order executor logging
log.SetLevel(log.ErrorLevel)
if verboseCnt == 0 {
trader.DisableLogging()
}

21
pkg/cmd/root.go
View File

@ -47,6 +47,11 @@ var RootCmd = &cobra.Command{
}
}
if viper.GetBool("debug") {
log.Infof("debug mode is enabled")
log.SetLevel(log.DebugLevel)
}
configFile, err := cmd.Flags().GetString("config")
if err != nil {
return errors.Wrapf(err, "failed to get the config flag")
@ -81,7 +86,7 @@ var RootCmd = &cobra.Command{
}
func init() {
RootCmd.PersistentFlags().Bool("debug", false, "debug flag")
RootCmd.PersistentFlags().Bool("debug", false, "debug mode")
RootCmd.PersistentFlags().String("config", "bbgo.yaml", "config file")
RootCmd.PersistentFlags().Bool("no-dotenv", false, "disable built-in dotenv")
@ -133,21 +138,10 @@ func init() {
return
}
if err := viper.BindPFlags(RootCmd.Flags()); err != nil {
log.WithError(err).Errorf("failed to bind local flags. please check the flag settings.")
return
}
log.SetFormatter(&prefixed.TextFormatter{})
}
func Execute() {
log.SetFormatter(&prefixed.TextFormatter{})
logger := log.StandardLogger()
if viper.GetBool("debug") {
logger.SetLevel(log.DebugLevel)
}
environment := os.Getenv("BBGO_ENV")
switch environment {
case "production", "prod":
@ -161,6 +155,7 @@ func Execute() {
if err != nil {
log.Panic(err)
}
logger := log.StandardLogger()
logger.AddHook(
lfshook.NewHook(
lfshook.WriterMap{