extern/zrepl
1
0
Fork 0
mirror of https://github.com/zrepl/zrepl.git synced 2025-08-09 15:14:52 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

convert more code to structured logging

Browse Source
This commit is contained in:
Christian Schwarz
2017-09-23 17:52:29 +02:00
parent 83edcb3889
commit c31ec8c646
6 changed files with 44 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
cmd/daemon.go
View File

@ -68,12 +68,11 @@ func (d *Daemon) Loop(ctx context.Context) {
signal.Notify(sigChan, syscall.SIGINT, syscall.SIGTERM)
log.Printf("starting jobs from config")
log.Info("starting jobs from config")
i := 0
for _, job := range d.conf.Jobs {
log.Printf("starting job %s", job.JobName())
logger := log.WithField(logJobField, job.JobName())
logger.Info("starting")
i++
jobCtx := context.WithValue(ctx, contextKeyLog, logger)
go func(j Job) {
@ -86,23 +85,22 @@ func (d *Daemon) Loop(ctx context.Context) {
outer:
for {
select {
case j := <-finishs:
log.Printf("job finished: %s", j.JobName())
case <-finishs:
finishCount++
if finishCount == len(d.conf.Jobs) {
log.Printf("all jobs finished")
log.Info("all jobs finished")
break outer
}
case sig := <-sigChan:
log.Printf("received signal: %s", sig)
log.Printf("cancelling all jobs")
log.WithField("signal", sig).Info("received signal")
log.Info("cancelling all jobs")
cancel()
}
}
signal.Stop(sigChan)
log.Printf("exiting")
log.Info("exiting")
}