adminer/zrepl_patched
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cmd: clean up usage of contextKeyLog through getter and setter functions

Browse Source
This commit is contained in:
Christian Schwarz
2018-08-26 14:58:57 +02:00
parent 666ead2646
commit f6be5b776b
7 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/config_job_source.go
+2 -3
View File
@@ -89,7 +89,7 @@ func (j *SourceJob) JobType() JobType { return JobTypeSource }
func (j *SourceJob) JobStart(ctx context.Context) {
log := ctx.Value(contextKeyLog).(Logger)
log := getLogger(ctx)
defer log.Info("exiting")
j.autosnapTask = NewTask("autosnap", j, log)
@@ -196,7 +196,6 @@ outer:
}
return
}
func (j *SourceJob) handleConnection(conn net.Conn, task *Task) {
@@ -209,7 +208,7 @@ func (j *SourceJob) handleConnection(conn net.Conn, task *Task) {
senderEP := endpoint.NewSender(j.Filesystems, NewPrefixFilter(j.SnapshotPrefix))
ctx := context.Background()
ctx = context.WithValue(ctx, contextKeyLog, task.Log().WithField(logSubsysField, "rpc.endpoint"))
ctx = endpoint.WithLogger(ctx, task.Log().WithField(logSubsysField, "rpc.endpoint"))
ctx = streamrpc.ContextWithLogger(ctx, streamrpcLogAdaptor{task.Log().WithField(logSubsysField, "rpc.protocol")})
handler := endpoint.NewHandler(senderEP)
if err := streamrpc.ServeConn(ctx, conn, STREAMRPC_CONFIG, handler.Handle); err != nil {