extern/zrepl
1
0
Fork 0
mirror of https://github.com/zrepl/zrepl.git synced 2025-08-18 02:39:46 +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

20
cmd/config_job_pull.go
View File

@@ -94,16 +94,16 @@ func (j *PullJob) JobName() string {
func (j *PullJob) JobStart(ctx context.Context) {
log := ctx.Value(contextKeyLog).(Logger)
defer log.Printf("exiting")
defer log.Info("exiting")
ticker := time.NewTicker(j.Interval)
start:
log.Printf("connecting")
log.Info("connecting")
rwc, err := j.Connect.Connect()
if err != nil {
log.Printf("error connecting: %s", err)
log.WithError(err).Error("error connecting")
return
}
@@ -117,31 +117,31 @@ start:
client.SetLogger(log, true)
}
log.Printf("starting pull")
log.Info("starting pull")
pullLog := log.WithField(logTaskField, "pull")
err = doPull(PullContext{client, pullLog, j.Mapping, j.InitialReplPolicy})
if err != nil {
log.Printf("error doing pull: %s", err)
log.WithError(err).Error("error doing pull")
}
closeRPCWithTimeout(log, client, time.Second*10, "")
log.Printf("starting prune")
log.Info("starting prune")
prunectx := context.WithValue(ctx, contextKeyLog, log.WithField(logTaskField, "prune"))
pruner, err := j.Pruner(PrunePolicySideDefault, false)
if err != nil {
log.Printf("error creating pruner: %s", err)
log.WithError(err).Error("error creating pruner")
return
}
pruner.Run(prunectx)
log.Printf("finish prune")
log.Info("finish prune")
log.Printf("wait for next interval")
log.Info("wait for next interval")
select {
case <-ctx.Done():
log.Printf("context: %s", ctx.Err())
log.WithError(ctx.Err()).Info("context")
return
case <-ticker.C:
goto start