Merge pull request #2 from DeBankDeFi/update

chore: use glog lib finnaly

amqp/amqp.go

@@ -5,7 +5,7 @@ import (
 	"errors"
 	"strings"
 
-	"github.com/XSAM/go-hybrid/log"
+	log "github.com/DeBankDeFi/glog"
 	"github.com/streadway/amqp"
 )
 
@@ -16,6 +16,10 @@ var (
 	ErrDeliveryChannelClosed = errors.New("delivery channel was closed")
 )
 
+var (
+	logger = log.NewLogFactory().DefaultLogger(log.LevelInfo)
+)
+
 // Config ...
 type Config amqp.Config
 
@@ -113,21 +117,21 @@ type Handler func(ctx context.Context, ch *Channel, d *Delivery) error
 
 // Consume consume message from amqp broker in block mode.
 func (ch *Channel) Consume(ctx context.Context, queue string, handler Handler, dc <-chan amqp.Delivery) error {
-	log.BgLogger().Infof("amqp: start the consumer of %s queue", queue)
+	logger.Infof(ctx, "amqp: start the consumer of %s queue", queue)
 	for {
 		select {
 		case <-ctx.Done():
-			log.BgLogger().Infof("amqp: stop the consumer of %s queue", queue)
+			logger.Infof(ctx, "amqp: stop the consumer of %s queue", queue)
 			return nil
 		case d, ok := <-dc:
 			if !ok {
-				log.BgLogger().Warnf("amqp: the deliver channel of %s queue closed", queue)
+				logger.Warnf(ctx, "amqp: the deliver channel of %s queue closed", queue)
 				return ErrDeliveryChannelClosed
 			}
 			go func() {
 				err := ch.consume(queue, handler, &Delivery{&d})
 				if err != nil {
-					log.BgLogger().Warnf("amqp: execute handler with queue %s failed, reason: %v", queue, err.Error())
+					logger.Warnf(ctx, "amqp: execute handler with queue %s failed, reason: %v", queue, err.Error())
 				}
 			}()
 		}

cmdhelper/version.go

@@ -1,20 +1,20 @@
 package cmdhelper
 
 import (
+	"fmt"
+
 	"github.com/DeBankDeFi/golib/shared"
 
-	"github.com/XSAM/go-hybrid/log"
 	"github.com/spf13/cobra"
-	"go.uber.org/zap"
 )
 
 func Version() *cobra.Command {
 	cmd := cobra.Command{
 		Use:   "version",
 		Short: "Print version information",
 		Run: func(cmd *cobra.Command, args []string) {
-			log.BgLogger().Info("app info", zap.Any("info", shared.AppInfo()))
+			fmt.Println(shared.AppInfo())
 		},
 	}
 	return &cmd
-}
+}

go.mod

@@ -3,13 +3,14 @@ module github.com/DeBankDeFi/golib
 go 1.15
 
 require (
-	github.com/XSAM/go-hybrid v1.0.0
+	github.com/DeBankDeFi/glog v0.0.0-20201123022541-666435a4b1f3
 	github.com/golang/protobuf v1.4.3
 	github.com/google/uuid v1.1.2
 	github.com/pkg/errors v0.9.1
 	github.com/spf13/cobra v1.1.1
 	github.com/streadway/amqp v1.0.0
 	github.com/stretchr/testify v1.6.1
-	go.uber.org/zap v1.14.1
+	golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297 // indirect
+	golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a // indirect
 	google.golang.org/grpc v1.33.2
 )