From c8ed03fb500a8fe4e9e2f12c9b7bfa62e7d0e5aa Mon Sep 17 00:00:00 2001 From: Gaius Date: Thu, 19 Aug 2021 17:52:59 +0800 Subject: [PATCH 1/2] feat: empty job Signed-off-by: Gaius --- scheduler/scheduler.go | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/scheduler/scheduler.go b/scheduler/scheduler.go index 2891798106f..316d3a71f7f 100644 --- a/scheduler/scheduler.go +++ b/scheduler/scheduler.go @@ -134,12 +134,14 @@ func (s *Server) Serve() error { }() // Serve Job - go func() { - if err := s.job.Serve(); err != nil { - logger.Fatalf("job start failed %v", err) - } - logger.Info("job start successfully") - }() + if s.job != nil { + go func() { + if err := s.job.Serve(); err != nil { + logger.Fatalf("job start failed %v", err) + } + logger.Info("job start successfully") + }() + } // Serve Keepalive if s.managerClient != nil { From 4714dacb04182345f670eb890fe488484c19f9eb Mon Sep 17 00:00:00 2001 From: Gaius Date: Thu, 19 Aug 2021 17:57:34 +0800 Subject: [PATCH 2/2] feat: stop nil Signed-off-by: Gaius --- scheduler/scheduler.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/scheduler/scheduler.go b/scheduler/scheduler.go index 316d3a71f7f..3c6c648e48a 100644 --- a/scheduler/scheduler.go +++ b/scheduler/scheduler.go @@ -228,9 +228,13 @@ func (s *Server) keepAlive(ctx context.Context) error { } func (s *Server) Stop() { - s.managerConn.Close() + if s.managerConn != nil { + s.managerConn.Close() + } s.dynConfig.Stop() s.schedulerService.Stop() - s.job.Stop() + if s.job != nil { + s.job.Stop() + } rpc.StopServer() }