feat: add CronLogAdapter #88

cronopts/log.go

@@ -0,0 +1,21 @@
+package cronopts
+
+import (
+	"github.com/go-kit/kit/log"
+	"github.com/go-kit/kit/log/level"
+)
+
+// CronLogAdapter is an adapter between kitlog and cron logger interface
+type CronLogAdapter struct {
+	Logging log.Logger
+}
+
+// Info implements cron.Logger
+func (r CronLogAdapter) Info(msg string, keysAndValues ...interface{}) {
+	_ = level.Info(r.Logging).Log(append([]interface{}{"msg", msg}, keysAndValues...)...)
+}
+
+// Error implements cron.Logger
+func (r CronLogAdapter) Error(err error, msg string, keysAndValues ...interface{}) {
+	_ = level.Error(r.Logging).Log(append([]interface{}{"msg", msg, "err", err}, keysAndValues...)...)
+}

cronopts/log_test.go

@@ -0,0 +1,23 @@
+package cronopts
+
+import (
+	"bytes"
+	"github.com/go-kit/kit/log"
+	"github.com/pkg/errors"
+	"github.com/stretchr/testify/assert"
+	"testing"
+)
+
+func TestCronLogAdapter_Info(t *testing.T) {
+	var buf bytes.Buffer
+	l := CronLogAdapter{Logging: log.NewLogfmtLogger(&buf)}
+	l.Info("msg", "key","value")
+	assert.Equal(t, "level=info msg=msg key=value\n", buf.String())
+}
+
+func TestCronLogAdapter_Error(t *testing.T) {
+	var buf bytes.Buffer
+	l := CronLogAdapter{Logging: log.NewLogfmtLogger(&buf)}
+	l.Error(errors.New("err"),"msg", "key","value")
+	assert.Equal(t, "level=error msg=msg err=err key=value\n",buf.String())
+}

serve.go

@@ -3,6 +3,7 @@ package core
 import (
 	"context"
 	"github.com/DoNewsCode/core/events"
+	"github.com/DoNewsCode/core/cronopts"
 	"net"
 	"net/http"
 	"os"
@@ -123,8 +124,9 @@ func newServeCmd(p serveIn) *cobra.Command {
 			// Start cron runner
 			if !p.Config.Bool("cron.disable") {
 				if p.Cron == nil {
-					p.Cron = cron.New()
+					p.Cron = cron.New(cron.WithLogger(cronopts.CronLogAdapter{Logging: l}))
 				}
+
 				p.Container.ApplyCron(p.Cron)
 				g.Add(func() error {
 					l.Info("cron runner started")