From d1a758a06e1fed45bd1ec4ce63fa813815f524ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Tue, 29 Jan 2019 16:57:38 +0100 Subject: [PATCH] MM-13873: Fix race condition on filesystem licence load (#10196) --- app/license.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/license.go b/app/license.go index 1b8e0ad283..34d9fd47d9 100644 --- a/app/license.go +++ b/app/license.go @@ -92,10 +92,10 @@ func (a *App) SaveLicense(licenseBytes []byte) (*model.License, *model.AppError) // start job server if necessary - this handles the edge case where a license file is uploaded, but the job server // doesn't start until the server is restarted, which prevents the 'run job now' buttons in system console from // functioning as expected - if *a.Config().JobSettings.RunJobs { + if *a.Config().JobSettings.RunJobs && a.Srv.Jobs != nil && a.Srv.Jobs.Workers != nil { a.Srv.Jobs.StartWorkers() } - if *a.Config().JobSettings.RunScheduler { + if *a.Config().JobSettings.RunScheduler && a.Srv.Jobs != nil && a.Srv.Jobs.Schedulers != nil { a.Srv.Jobs.StartSchedulers() }