Skip to content

Commit

Permalink
use logger wrapper
Browse files Browse the repository at this point in the history
  • Loading branch information
kobtea committed Jan 3, 2023
1 parent b1e030c commit 2f80bc8
Show file tree
Hide file tree
Showing 4 changed files with 61 additions and 5 deletions.
5 changes: 3 additions & 2 deletions check/check.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,15 @@ import (
"fmt"

"github.com/kobtea/gorgo/config"
"github.com/kobtea/gorgo/log"
"github.com/kobtea/gorgo/storage"
"github.com/open-policy-agent/conftest/output"
"github.com/open-policy-agent/conftest/runner"
"go.uber.org/zap"
)

func Check(ctx context.Context, cfg *config.Config) error {
logger := zap.S().Named("check")
logger := log.GetLogger().Named("check")
defer log.MustSync()
logger.Info("check data")
var result []output.CheckResult
st, err := storage.NewStorage(cfg.WorkingDir)
Expand Down
4 changes: 2 additions & 2 deletions fetch/fetch.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ import (

"github.com/google/go-github/v48/github"
"github.com/kobtea/gorgo/config"
"github.com/kobtea/gorgo/log"
"github.com/kobtea/gorgo/storage"
"go.uber.org/zap"
"golang.org/x/oauth2"
)

func Fetch(ctx context.Context, cfg *config.Config) error {
zap.S().Named("fetch").Info("fetch data")
log.GetLogger().Named("fetch").Info("fetch data")
storage, err := storage.NewStorage(cfg.WorkingDir)
if err != nil {
return err
Expand Down
54 changes: 54 additions & 0 deletions log/log.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
package log

import (
"fmt"
"time"

"go.uber.org/zap"
"go.uber.org/zap/zapcore"
)

var logger *zap.SugaredLogger
var initialized = false

func MustSync() {
if err := logger.Sync(); err != nil {
// see: https://github.com/uber-go/zap/issues/880
}
}

type LoggerOption struct {
Level string
}

func InitLogger(opt *LoggerOption) error {
loggerConfig := zap.NewProductionConfig()
lv, err := zap.ParseAtomicLevel(opt.Level)
var keeperr error
if err != nil {
keeperr = err
lv = zap.NewAtomicLevelAt(zap.InfoLevel)
}
loggerConfig.Level = lv
loggerConfig.EncoderConfig.EncodeTime = zapcore.TimeEncoderOfLayout(time.RFC3339)
log, err := loggerConfig.Build()
if err != nil {
return err
}
if keeperr != nil {
log.Error(fmt.Sprintf("invalid log level: %s. use `info` instead", opt.Level))
}
zap.ReplaceGlobals(log)
logger = log.Sugar()
initialized = true
return err
}

func GetLogger() *zap.SugaredLogger {
if !initialized {
if err := InitLogger(&LoggerOption{}); err != nil {
panic(err)
}
}
return logger
}
3 changes: 2 additions & 1 deletion storage/storage.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (

"github.com/go-git/go-git/v5"
"github.com/go-git/go-git/v5/plumbing/transport/http"
"github.com/kobtea/gorgo/log"
"go.uber.org/zap"
)

Expand All @@ -27,7 +28,7 @@ type Storage struct {
func NewStorage(workingDir string) (*Storage, error) {
s := &Storage{
workingDir: workingDir,
logger: zap.S().Named("storage"),
logger: log.GetLogger().Named("storage"),
}
if err := s.prepareGc(); err != nil {
return nil, err
Expand Down

0 comments on commit 2f80bc8

Please sign in to comment.