feat: add job logger (#740)

Signed-off-by: Gaius <[email protected]>

Author: gaius-qi

internal/dflog/logcore/init.go

@@ -48,6 +48,12 @@ func InitManager(console bool) error {
 	}
 	logger.SetGcLogger(gcLogger.Sugar())
 
+	jobLogger, err := CreateLogger(path.Join(logDir, JobLogFileName), false, false)
+	if err != nil {
+		return err
+	}
+	logger.SetJobLogger(jobLogger.Sugar())
+
 	return nil
 }
 
@@ -76,6 +82,12 @@ func InitScheduler(console bool) error {
 	}
 	logger.SetGcLogger(gcLogger.Sugar())
 
+	jobLogger, err := CreateLogger(path.Join(logDir, JobLogFileName), false, false)
+	if err != nil {
+		return err
+	}
+	logger.SetJobLogger(jobLogger.Sugar())
+
 	statPeerLogger, err := CreateLogger(path.Join(logDir, StatPeerLogFileName), true, true)
 	if err != nil {
 		return err
@@ -110,6 +122,12 @@ func InitCdnSystem(console bool) error {
 	}
 	logger.SetGcLogger(gcLogger.Sugar())
 
+	jobLogger, err := CreateLogger(path.Join(logDir, JobLogFileName), false, false)
+	if err != nil {
+		return err
+	}
+	logger.SetJobLogger(jobLogger.Sugar())
+
 	statSeedLogger, err := CreateLogger(path.Join(logDir, StatSeedLogFileName), true, true)
 	if err != nil {
 		return err

internal/dflog/logcore/logcore.go

@@ -28,6 +28,7 @@ var (
 	CoreLogFileName       = "core.log"
 	GrpcLogFileName       = "grpc.log"
 	GCLogFileName         = "gc.log"
+	JobLogFileName        = "job.log"
 	StatPeerLogFileName   = "peer.log"
 	StatSeedLogFileName   = "stat/seed.log"
 	DownloaderLogFileName = "downloader.log"

internal/dflog/logger.go

@@ -27,6 +27,7 @@ var (
 	CoreLogger       *zap.SugaredLogger
 	GrpcLogger       *zap.SugaredLogger
 	GcLogger         *zap.SugaredLogger
+	JobLogger        *zap.SugaredLogger
 	KeepAliveLogger  *zap.SugaredLogger
 	StatPeerLogger   *zap.Logger
 	StatSeedLogger   *zap.Logger
@@ -78,6 +79,10 @@ func SetGrpcLogger(log *zap.SugaredLogger) {
 	grpclog.SetLoggerV2(&zapGrpc{GrpcLogger})
 }
 
+func SetJobLogger(log *zap.SugaredLogger) {
+	JobLogger = log
+}
+
 type SugaredLoggerOnWith struct {
 	withArgs []interface{}
 }

internal/job/job.go

@@ -29,6 +29,7 @@ import (
 
 	"github.com/RichardKnop/machinery/v1"
 	machineryv1config "github.com/RichardKnop/machinery/v1/config"
+	machineryv1log "github.com/RichardKnop/machinery/v1/log"
 )
 
 const (
@@ -50,6 +51,9 @@ type Job struct {
 }
 
 func New(cfg *Config, queue Queue) (*Job, error) {
+	// Set logger
+	machineryv1log.Set(&MachineryLogger{})
+
 	broker := fmt.Sprintf("redis://%s@%s:%d/%d", cfg.Password, cfg.Host, cfg.Port, cfg.BrokerDB)
 	if err := ping(&redis.Options{
 		Addr:     fmt.Sprintf("%s:%d", cfg.Host, cfg.Port),

internal/job/logger.go

@@ -0,0 +1,52 @@
+package job
+
+import (
+	logger "d7y.io/dragonfly/v2/internal/dflog"
+)
+
+type MachineryLogger struct{}
+
+// Print sends to logger.Info
+func (m *MachineryLogger) Print(args ...interface{}) {
+	logger.JobLogger.Info(args...)
+}
+
+// Printf sends to logger.Infof
+func (m *MachineryLogger) Printf(format string, args ...interface{}) {
+	logger.JobLogger.Infof(format, args...)
+}
+
+// Println sends to logger.Info
+func (m *MachineryLogger) Println(args ...interface{}) {
+	logger.JobLogger.Info(args...)
+}
+
+// Fatal sends to logger.Fatal
+func (m *MachineryLogger) Fatal(args ...interface{}) {
+	logger.JobLogger.Fatal(args...)
+}
+
+// Fatalf sends to logger.Fatalf
+func (m *MachineryLogger) Fatalf(format string, args ...interface{}) {
+	logger.JobLogger.Fatalf(format, args...)
+}
+
+// Fatalln sends to logger.Fatal
+func (m *MachineryLogger) Fatalln(args ...interface{}) {
+	logger.JobLogger.Fatal(args...)
+}
+
+// Panic sends to logger.Panic
+func (m *MachineryLogger) Panic(args ...interface{}) {
+	logger.JobLogger.Panic(args...)
+}
+
+// Panicf sends to logger.Panic
+func (m *MachineryLogger) Panicf(format string, args ...interface{}) {
+	logger.JobLogger.Panic(args...)
+}
+
+// Panicln sends to logrus.Panic
+func (m *MachineryLogger) Panicln(args ...interface{}) {
+	logger.JobLogger.Panic(args...)
+}