Add the command line of setting log level (#109)

ipfs-force-community · Jun 9, 2021 · bbbd198 · bbbd198
1 parent 8450043
commit bbbd198
Show file tree

Hide file tree

Showing 19 changed files with 126 additions and 61 deletions.
diff --git a/api/client/api.go b/api/client/api.go
@@ -61,6 +61,8 @@ type IMessager interface {
 	ResponseEvent(ctx context.Context, resp *gatewayTypes.ResponseEvent) error                                             //perm:write
 	ListenWalletEvent(ctx context.Context, wrp *walletevent.WalletRegisterPolicy) (chan *gatewayTypes.RequestEvent, error) //perm:write
 	SupportNewAccount(ctx context.Context, channelId string, account string) error                                         //perm:write
+
+	SetLogLevel(ctx context.Context, level string) error //perm:admin
 }
 
 var _ IMessager = (*Message)(nil)
@@ -113,6 +115,8 @@ type Message struct {
 		ResponseEvent     func(ctx context.Context, resp *gatewayTypes.ResponseEvent) error
 		ListenWalletEvent func(ctx context.Context, wrp *walletevent.WalletRegisterPolicy) (chan *gatewayTypes.RequestEvent, error)
 		SupportNewAccount func(ctx context.Context, channelId string, account string) error
+
+		SetLogLevel func(ctx context.Context, level string) error
 	}
 }
 
@@ -291,3 +295,9 @@ func (message *Message) ListenWalletEvent(ctx context.Context, wrp *walletevent.
 func (message *Message) SupportNewAccount(ctx context.Context, channelId string, account string) error {
 	return message.Internal.SupportNewAccount(ctx, channelId, account)
 }
+
+/////// log ///////
+
+func (message *Message) SetLogLevel(ctx context.Context, level string) error {
+	return message.Internal.SetLogLevel(ctx, level)
+}
diff --git a/api/controller/auth_map.go b/api/controller/auth_map.go
@@ -43,4 +43,5 @@ var AuthMap = map[string]string{
 	"DeleteAddress":            "admin",
 	"SetFeeParams":             "admin",
 	"WalletHas":                "read",
+	"SetLogLevel":              "admin",
 }
diff --git a/api/controller/controller.go b/api/controller/controller.go
@@ -1,9 +1,7 @@
 package controller
 
-import (
-	"github.com/sirupsen/logrus"
-)
+import "github.com/filecoin-project/venus-messager/log"
 
 type BaseController struct {
-	Logger *logrus.Logger
+	Logger *log.Logger
 }
diff --git a/api/controller/modules.go b/api/controller/modules.go
@@ -9,9 +9,9 @@ import (
 	"strconv"
 
 	"github.com/gin-gonic/gin"
-	"github.com/sirupsen/logrus"
 	"golang.org/x/xerrors"
 
+	"github.com/filecoin-project/venus-messager/log"
 	"github.com/filecoin-project/venus-messager/service"
 	"github.com/filecoin-project/venus-messager/types"
 )
@@ -37,7 +37,7 @@ const (
 
 var errorInterface = reflect.TypeOf((*error)(nil)).Elem()
 
-func SetupController(router *gin.Engine, sMap service.ServiceMap, log *logrus.Logger) error {
+func SetupController(router *gin.Engine, sMap service.ServiceMap, log *log.Logger) error {
 	v1 := router.Group("rpc/v0")
 	var ts []reflect.Type
 	ts = append(ts, reflect.TypeOf(Message{}), reflect.TypeOf(Address{}), reflect.TypeOf(SharedParamsCtrl{}),
@@ -56,7 +56,7 @@ type JsonRpcResponse struct {
 	Error  *RespError  `json:"error,omitempty"`
 }
 
-func registerController(v1 *gin.RouterGroup, sMap service.ServiceMap, log *logrus.Logger, controllers []reflect.Type) error {
+func registerController(v1 *gin.RouterGroup, sMap service.ServiceMap, log *log.Logger, controllers []reflect.Type) error {
 	for i := range controllers {
 		controllerT := controllers[i]
 		methodNumber := controllerT.NumMethod()

diff --git a/api/jwt/jwt_middleware.go b/api/jwt/jwt_middleware.go
@@ -8,18 +8,19 @@ import (
 	"github.com/filecoin-project/venus-auth/core"
 	"github.com/filecoin-project/venus-auth/util"
 	"github.com/ipfs-force-community/venus-gateway/types"
-	"github.com/sirupsen/logrus"
+
+	"github.com/filecoin-project/venus-messager/log"
 )
 
 type AuthMux struct {
 	jwtClient   IJwtClient
-	log         *logrus.Logger
+	log         *log.Logger
 	mux         *http.ServeMux
 	trustHandle map[string]http.Handler
 }
 
-func NewAuthMux(jwtClient IJwtClient, log *logrus.Logger, mux *http.ServeMux) *AuthMux {
-	return &AuthMux{jwtClient: jwtClient, log: log, mux: mux, trustHandle: map[string]http.Handler{}}
+func NewAuthMux(jwtClient IJwtClient, logger *log.Logger, mux *http.ServeMux) *AuthMux {
+	return &AuthMux{jwtClient: jwtClient, log: logger, mux: mux, trustHandle: map[string]http.Handler{}}
 }
 
 func (authMux *AuthMux) ServeHTTP(w http.ResponseWriter, r *http.Request) {

diff --git a/api/modules.go b/api/modules.go
@@ -9,18 +9,18 @@ import (
 
 	"github.com/filecoin-project/go-jsonrpc"
 	"github.com/filecoin-project/venus-auth/core"
-	"github.com/sirupsen/logrus"
 	"go.uber.org/fx"
 	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/venus-messager/api/client"
 	"github.com/filecoin-project/venus-messager/api/controller"
 	"github.com/filecoin-project/venus-messager/api/jwt"
 	"github.com/filecoin-project/venus-messager/gateway"
+	"github.com/filecoin-project/venus-messager/log"
 	"github.com/filecoin-project/venus-messager/service"
 )
 
-func RunAPI(lc fx.Lifecycle, jwtClient jwt.IJwtClient, lst net.Listener, log *logrus.Logger, msgImp *MessageImp) error {
+func RunAPI(lc fx.Lifecycle, jwtClient jwt.IJwtClient, lst net.Listener, log *log.Logger, msgImp *MessageImp) error {
 	var msgAPI client.Message
 	PermissionedProxy(controller.AuthMap, msgImp, &msgAPI.Internal)
 
@@ -59,6 +59,7 @@ type ImplParams struct {
 	NodeService         *service.NodeService
 	SharedParamsService *service.SharedParamsService
 	GatewayService      *gateway.GatewayService `optional:"true"`
+	Logger              *log.Logger
 }
 
 type MessageImp struct {
@@ -67,6 +68,7 @@ type MessageImp struct {
 	*service.NodeService
 	*service.SharedParamsService
 	*gateway.GatewayService
+	*log.Logger
 }
 
 var _ client.IMessager = (*MessageImp)(nil)
@@ -78,6 +80,7 @@ func NewMessageImp(implParams ImplParams) *MessageImp {
 		NodeService:         implParams.NodeService,
 		SharedParamsService: implParams.SharedParamsService,
 		GatewayService:      implParams.GatewayService,
+		Logger:              implParams.Logger,
 	}
 }
 

diff --git a/cli/log.go b/cli/log.go
@@ -0,0 +1,37 @@
+package cli
+
+import (
+	"github.com/urfave/cli/v2"
+	"golang.org/x/xerrors"
+)
+
+var LogCmds = &cli.Command{
+	Name:  "log",
+	Usage: "log commands",
+	Subcommands: []*cli.Command{
+		setLevelCmd,
+	},
+}
+
+var setLevelCmd = &cli.Command{
+	Name:      "set-level",
+	Usage:     "set log level, eg. trace,debug,info,warn|warning,error,fatal,panic",
+	ArgsUsage: "level",
+	Action: func(ctx *cli.Context) error {
+		client, closer, err := getAPI(ctx)
+		if err != nil {
+			return err
+		}
+		defer closer()
+
+		if ctx.NArg() == 0 {
+			return xerrors.New("must has level argument")
+		}
+
+		err = client.SetLogLevel(ctx.Context, ctx.Args().Get(0))
+		if err != nil {
+			return err
+		}
+		return nil
+	},
+}
diff --git a/log/log.go b/log/log.go
@@ -1,6 +1,7 @@
 package log
 
 import (
+	"context"
 	"fmt"
 	"math"
 	"net/http"
@@ -14,24 +15,43 @@ import (
 	"github.com/filecoin-project/venus-messager/config"
 )
 
-func SetLogger(logCfg *config.LogConfig) (*logrus.Logger, error) {
+type Logger struct {
+	*logrus.Logger
+}
+
+func New() *Logger {
+	return &Logger{logrus.New()}
+}
+
+func SetLogger(logCfg *config.LogConfig) (*Logger, error) {
 	log := logrus.New()
-	level, err := logrus.ParseLevel(logCfg.Level)
-	if err != nil {
-		return nil, err
-	}
 	log.SetFormatter(&logrus.TextFormatter{
 		ForceColors:   true,
 		FullTimestamp: true,
 	})
-	log.SetLevel(level)
+	logger := &Logger{log}
+	err := logger.SetLogLevel(context.Background(), logCfg.Level)
+	if err != nil {
+		return nil, err
+	}
+
 	file, err := os.OpenFile(logCfg.Path, os.O_CREATE|os.O_WRONLY, 0666)
 	if err == nil {
 		logrus.SetOutput(file)
 	} else {
 		return nil, xerrors.Errorf("open log file fail")
 	}
-	return log, nil
+	return logger, nil
+}
+
+func (logger *Logger) SetLogLevel(ctx context.Context, levelStr string) error {
+	level, err := logrus.ParseLevel(levelStr)
+	if err != nil {
+		return err
+	}
+	logger.SetLevel(level)
+
+	return nil
 }
 
 // 2016-09-27 09:38:21.541541811 +0200 CEST

diff --git a/main.go b/main.go
@@ -10,7 +10,6 @@ import (
 	ma "github.com/multiformats/go-multiaddr"
 	manet "github.com/multiformats/go-multiaddr/net"
 
-	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli/v2"
 	"go.uber.org/fx"
 	"golang.org/x/xerrors"
@@ -42,6 +41,7 @@ func main() {
 			ccli.AddrCmds,
 			ccli.SharedParamsCmds,
 			ccli.NodeCmds,
+			ccli.LogCmds,
 			runCmd,
 		},
 	}
@@ -282,7 +282,7 @@ func updateFlag(cfg *config.Config, ctx *cli.Context) error {
 }
 
 type fxLogger struct {
-	log *logrus.Logger
+	log *log.Logger
 }
 
 func (l fxLogger) Printf(str string, args ...interface{}) {

diff --git a/messager.toml b/messager.toml
@@ -34,7 +34,7 @@
   backTime = 86400
 
 [node]
-  url = "/ip4/8.130.166.31/tcp/1234"
+  url = "/ip4/8.130.165.167/tcp/1234"
   token = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJuYW1lIjoidGVzdG1pbmVyIiwicGVybSI6ImFkbWluIiwiZXh0IjoiIn0.oakIfSg1Iiv1T2F1BtH1bsb_1GeXWuirdPSjvE5wQLs"
 
 [wallet]

diff --git a/service/address_service.go b/service/address_service.go
@@ -3,14 +3,13 @@ package service
 import (
 	"context"
 
-	"github.com/filecoin-project/go-state-types/big"
-
 	"github.com/filecoin-project/go-address"
+	"github.com/filecoin-project/go-state-types/big"
 	venusTypes "github.com/filecoin-project/venus/pkg/types"
-	"github.com/sirupsen/logrus"
 	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/venus-messager/gateway"
+	"github.com/filecoin-project/venus-messager/log"
 	"github.com/filecoin-project/venus-messager/models/repo"
 	"github.com/filecoin-project/venus-messager/types"
 )
@@ -19,13 +18,13 @@ var errAddressNotExists = xerrors.New("address not exists")
 
 type AddressService struct {
 	repo repo.Repo
-	log  *logrus.Logger
+	log  *log.Logger
 
 	sps          *SharedParamsService
 	walletClient *gateway.IWalletCli
 }
 
-func NewAddressService(repo repo.Repo, logger *logrus.Logger, sps *SharedParamsService, walletClient *gateway.IWalletCli) *AddressService {
+func NewAddressService(repo repo.Repo, logger *log.Logger, sps *SharedParamsService, walletClient *gateway.IWalletCli) *AddressService {
 	addressService := &AddressService{
 		repo: repo,
 		log:  logger,

diff --git a/service/events.go b/service/events.go
@@ -3,15 +3,16 @@ package service
 import (
 	"context"
 
+	"golang.org/x/xerrors"
+
+	"github.com/filecoin-project/venus-messager/log"
 	"github.com/filecoin-project/venus/pkg/chain"
 	"github.com/filecoin-project/venus/pkg/types"
-	"github.com/sirupsen/logrus"
-	"golang.org/x/xerrors"
 )
 
 type NodeEvents struct {
 	client     *NodeClient
-	log        *logrus.Logger
+	log        *log.Logger
 	msgService *MessageService
 }
 

diff --git a/service/message_selector.go b/service/message_selector.go
@@ -6,22 +6,18 @@ import (
 	"sync"
 	"time"
 
-	"modernc.org/mathutil"
-
-	"github.com/filecoin-project/venus-messager/gateway"
-
 	"github.com/filecoin-project/go-address"
-	"github.com/filecoin-project/venus-wallet/core"
-
 	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/filecoin-project/go-state-types/big"
-
+	"github.com/filecoin-project/venus-wallet/core"
 	"github.com/filecoin-project/venus/pkg/crypto"
 	venusTypes "github.com/filecoin-project/venus/pkg/types"
-	"github.com/sirupsen/logrus"
 	"golang.org/x/xerrors"
+	"modernc.org/mathutil"
 
 	"github.com/filecoin-project/venus-messager/config"
+	"github.com/filecoin-project/venus-messager/gateway"
+	"github.com/filecoin-project/venus-messager/log"
 	"github.com/filecoin-project/venus-messager/models/repo"
 	"github.com/filecoin-project/venus-messager/types"
 )
@@ -33,7 +29,7 @@ const (
 
 type MessageSelector struct {
 	repo           repo.Repo
-	log            *logrus.Logger
+	log            *log.Logger
 	cfg            *config.MessageServiceConfig
 	nodeClient     *NodeClient
 	addressService *AddressService
@@ -55,14 +51,14 @@ type msgErrInfo struct {
 }
 
 func NewMessageSelector(repo repo.Repo,
-	log *logrus.Logger,
+	logger *log.Logger,
 	cfg *config.MessageServiceConfig,
 	nodeClient *NodeClient,
 	addressService *AddressService,
 	sps *SharedParamsService,
 	walletClient *gateway.IWalletCli) *MessageSelector {
 	return &MessageSelector{repo: repo,
-		log:            log,
+		log:            logger,
 		cfg:            cfg,
 		nodeClient:     nodeClient,
 		addressService: addressService,