From a32e793982f2cce048265b1f85461326502c762e Mon Sep 17 00:00:00 2001 From: Ben Schumacher Date: Fri, 8 Sep 2023 16:27:36 +0200 Subject: [PATCH] Fix logger panic in migration scheduler (#24509) Automatic Merge --- server/channels/jobs/migrations/scheduler.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/server/channels/jobs/migrations/scheduler.go b/server/channels/jobs/migrations/scheduler.go index a109246095..2888c5f53a 100644 --- a/server/channels/jobs/migrations/scheduler.go +++ b/server/channels/jobs/migrations/scheduler.go @@ -74,7 +74,12 @@ func (scheduler *Scheduler) ScheduleJob(c *request.Context, cfg *model.Config, p } if state == MigrationStateUnscheduled { - job.Logger.Debug("Scheduling a new job for migration.", mlog.String("scheduler", model.JobTypeMigrations), mlog.String("migration_key", key)) + // GetMigrationState can return a nil job + logger := scheduler.jobServer.Logger() + if job != nil { + logger = job.Logger + } + logger.Debug("Scheduling a new job for migration.", mlog.String("scheduler", model.JobTypeMigrations), mlog.String("migration_key", key)) return scheduler.createJob(c, key, job) }