go-pkg/asynq
2
0
Fork 0
mirror of https://github.com/hibiken/asynq.git synced 2025-10-22 09:56:12 +08:00
Code Issues Projects Releases Wiki Activity

https://github.com/hibiken/asynq/issues/439

Browse Source 
Allow a server instance to be gracefully shutdown programmatically
This commit is contained in:
herb
2022-04-22 13:38:46 -07:00
parent 5c723f597e
commit d1e5e4f2f1
4 changed files with 34 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scheduler.go
View File

@@ -41,6 +41,7 @@ type Scheduler struct {
// to avoid using cron.EntryID as the public API of
// the Scheduler.
idmap map[string]cron.EntryID
sigs chan os.Signal
}
// NewScheduler returns a new Scheduler instance given the redis connection option.
@@ -77,6 +78,7 @@ func NewScheduler(r RedisConnOpt, opts *SchedulerOpts) *Scheduler {
done: make(chan struct{}),
errHandler: opts.EnqueueErrorHandler,
idmap: make(map[string]cron.EntryID),
sigs: make(chan os.Signal, 1),
}
}

3
server.go
View File

@@ -10,6 +10,7 @@ import (
"fmt"
"math"
"math/rand"
"os"
"runtime"
"strings"
"sync"
@@ -51,6 +52,7 @@ type Server struct {
healthchecker *healthchecker
janitor *janitor
aggregator *aggregator
sigs chan os.Signal
}
type serverState struct {
@@ -547,6 +549,7 @@ func NewServer(r RedisConnOpt, cfg Config) *Server {
healthchecker: healthchecker,
janitor: janitor,
aggregator: aggregator,
sigs: make(chan os.Signal, 1),
}
}

19
signals_unix.go
View File

@@ -1,3 +1,4 @@
//go:build linux || bsd || darwin
// +build linux bsd darwin
package asynq
@@ -17,8 +18,7 @@ func (srv *Server) waitForSignals() {
srv.logger.Info("Send signal TSTP to stop processing new tasks")
srv.logger.Info("Send signal TERM or INT to terminate the process")
sigs := make(chan os.Signal, 1)
signal.Notify(sigs, unix.SIGTERM, unix.SIGINT, unix.SIGTSTP)
signal.Notify(srv.sigs, os.Interrupt, unix.SIGTERM, unix.SIGINT, unix.SIGTSTP)
for {
sig := <-sigs
if sig == unix.SIGTSTP {
@@ -29,9 +29,18 @@ func (srv *Server) waitForSignals() {
}
}
// SignalShutdown stops and shuts down the server.
func (srv *Server) SignalShutdown() {
srv.sigs <- os.Interrupt
}
func (s *Scheduler) waitForSignals() {
s.logger.Info("Send signal TERM or INT to stop the scheduler")
sigs := make(chan os.Signal, 1)
signal.Notify(sigs, unix.SIGTERM, unix.SIGINT)
<-sigs
signal.Notify(s.sigs, os.Interrupt, unix.SIGTERM, unix.SIGINT)
<-s.sigs
}
// SignalShutdown stops and shuts down the scheduler.
func (s *Scheduler) SignalShutdown() {
s.sigs <- os.Interrupt
}

21
signals_windows.go
View File

@@ -1,3 +1,4 @@
//go:build windows
// +build windows
package asynq
@@ -16,14 +17,22 @@ import (
// Note: Currently SIGTSTP is not supported for windows build.
func (srv *Server) waitForSignals() {
srv.logger.Info("Send signal TERM or INT to terminate the process")
sigs := make(chan os.Signal, 1)
signal.Notify(sigs, windows.SIGTERM, windows.SIGINT)
<-sigs
signal.Notify(srv.sigs, os.Interrupt, windows.SIGTERM, windows.SIGINT)
<-srv.sigs
}
// SignalShutdown stops and shuts down the server.
func (srv *Server) SignalShutdown() {
srv.sigs <- os.Interrupt
}
func (s *Scheduler) waitForSignals() {
s.logger.Info("Send signal TERM or INT to stop the scheduler")
sigs := make(chan os.Signal, 1)
signal.Notify(sigs, windows.SIGTERM, windows.SIGINT)
<-sigs
signal.Notify(s.sigs, os.Interrupt, windows.SIGTERM, windows.SIGINT)
<-s.sigs
}
// SignalShutdown stops and shuts down the scheduler.
func (s *Scheduler) SignalShutdown() {
s.sigs <- os.Interrupt
}