Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make scheduler logs to be rotated #238

Merged
merged 1 commit into from
Aug 4, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,6 @@ require (
github.com/russross/blackfriday/v2 v2.1.0 // indirect
golang.org/x/net v0.0.0-20211029224645-99673261e6eb // indirect
golang.org/x/sys v0.0.0-20211019181941-9d821ace8654 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect
)
2 changes: 2 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/natefinch/lumberjack.v2 v2.0.0 h1:1Lc07Kr7qY4U2YPouBjpCLxpiyxIVoxqXgkXLknAOE8=
gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k=
gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
Expand Down
40 changes: 17 additions & 23 deletions internal/runner/agent.go
Original file line number Diff line number Diff line change
@@ -1,23 +1,21 @@
package runner

import (
"fmt"
"log"
"os"
"os/signal"
"path"
"syscall"
"time"

"github.com/yohamta/dagu/internal/admin"
"github.com/yohamta/dagu/internal/logger"
"github.com/yohamta/dagu/internal/utils"
"gopkg.in/natefinch/lumberjack.v2"
)

type Agent struct {
*admin.Config
logger *logger.TeeLogger
stop chan struct{}
logger *logger.SimpleLogger
}

func NewAgent(cfg *admin.Config) *Agent {
Expand All @@ -44,13 +42,11 @@ func (a *Agent) Stop() {
}

func (a *Agent) start() error {
tl := &logger.TeeLogger{Writer: a.logger}
if err := tl.Open(); err != nil {
if err := a.logger.Open(); err != nil {
return err
}
defer func() {
utils.LogErr("close log file", a.closeLogFile())
tl.Close()
a.logger.Close()
}()

log.Printf("starting dagu scheduler")
Expand Down Expand Up @@ -80,25 +76,23 @@ func (a *Agent) registerRunnerShutdown(runner *Runner) {
}

func (a *Agent) setupLogFile() (err error) {
filename := path.Join(
a.LogDir,
fmt.Sprintf("scheduler.%s.log",
time.Now().Format("20060102.15:04:05.000"),
))
filename := path.Join(a.LogDir, "scheduler.log")
dir := path.Dir(filename)
if err := os.MkdirAll(dir, 0755); err != nil {
return err
}
a.logger = logger.NewSimpleLogger(
a.LogDir, "scheduler", time.Hour*24,
)
err = a.logger.Open()
return
}
log.Printf("setup log file: %s", filename)

func (a *Agent) closeLogFile() error {
if a.logger != nil {
return a.logger.Close()
a.logger = &logger.TeeLogger{
Writer: &lumberjack.Logger{
Filename: filename,
MaxSize: 20, // megabytes
MaxBackups: 3,
MaxAge: 28, //days
Compress: false, // disabled by default
},
}
return nil

log.Print("log file setuped")
return
}
1 change: 1 addition & 0 deletions internal/runner/runner.go
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ func (r *Runner) run(now time.Time) {
}
go func(e *Entry) {
if e.Job != nil {
log.Printf("[%s] %s", e.Next.Format("2006-01-02 15:04:05"), e.Job.String())
err := e.Job.Run()
if err != nil {
log.Printf("runner: failed to run job %s: %v", e.Job, err)
Expand Down