From 435ce3398c0d1e5673fa937654ca5e2ef108e7a1 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sat, 28 Dec 2019 15:42:18 -0700
Subject: [PATCH] Fix NPEs when the initial log context is used
---
cmd/media_repo/inits.go | 4 ++--
common/rcontext/request_context.go | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/cmd/media_repo/inits.go b/cmd/media_repo/inits.go
index 2bc77dfa..fc763a56 100644
--- a/cmd/media_repo/inits.go
+++ b/cmd/media_repo/inits.go
@@ -54,9 +54,9 @@ func scanAndStartUnfinishedTasks() error {
return err
}
- logrus.Infof("Started replacement task ID %d for unfinished task %d (%s)", newTask.ID, task.ID, task.Name)
+ taskCtx.Log.Infof("Started replacement task ID %d for unfinished task %d (%s)", newTask.ID, task.ID, task.Name)
} else {
- logrus.Warn(fmt.Sprintf("Unknown task %s at ID %d - ignoring", task.Name, task.ID))
+ taskCtx.Log.Warn(fmt.Sprintf("Unknown task %s at ID %d - ignoring", task.Name, task.ID))
}
}
diff --git a/common/rcontext/request_context.go b/common/rcontext/request_context.go
index d168ce60..4cd61d5d 100644
--- a/common/rcontext/request_context.go
+++ b/common/rcontext/request_context.go
@@ -10,7 +10,7 @@ import (
func Initial() RequestContext {
return RequestContext{
Context: context.Background(),
- Log: &logrus.Entry{},
+ Log: logrus.WithFields(logrus.Fields{"nocontext": true}),
Config: config.DomainRepoConfig{
MinimumRepoConfig: config.Get().MinimumRepoConfig,
Downloads: config.Get().Downloads.DownloadsConfig,
--
GitLab