From 295508ab37b2535e3bb56536e14e2fb89b6e2249 Mon Sep 17 00:00:00 2001 From: DanB Date: Wed, 7 Dec 2016 11:33:25 +0100 Subject: [PATCH] Disable scheduler in settings if we stop it via ServiceManager --- servmanager/servmanager.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/servmanager/servmanager.go b/servmanager/servmanager.go index 068473870..f808f2f5a 100644 --- a/servmanager/servmanager.go +++ b/servmanager/servmanager.go @@ -78,18 +78,18 @@ func (srvMngr *ServiceManager) StartScheduler(waitCache bool) error { func (srvMngr *ServiceManager) StopScheduler() error { var sched *scheduler.Scheduler srvMngr.Lock() - schedRunning := srvMngr.sched != nil - if schedRunning { + if srvMngr.sched != nil { sched = srvMngr.sched srvMngr.sched = nil // optimize the lock and release here } srvMngr.Unlock() - if !schedRunning { + if sched == nil { return utils.NewCGRError(utils.ServiceManager, utils.CapitalizedMessage(utils.ServiceAlreadyRunning), utils.ServiceAlreadyRunning, "the scheduler is not running") } + srvMngr.cfg.SchedulerEnabled = false sched.Shutdown() return nil }