Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Fix data race #560

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 24, 2024
Merged

Fix data race #560

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions internal/sock/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ import (
"net/http"
"os"
"strings"
"sync"
"sync/atomic"

"github.com/dagu-dev/dagu/internal/utils"
)
Expand All @@ -17,7 +19,8 @@ import (
type Server struct {
*Config
listener net.Listener
quit bool
quit atomic.Bool
mu sync.Mutex
}

type Config struct {
Expand All @@ -32,7 +35,6 @@ type HttpHandlerFunc func(w http.ResponseWriter, r *http.Request)
func NewServer(c *Config) (*Server, error) {
return &Server{
Config: c,
quit: false,
}, nil
}

Expand Down Expand Up @@ -61,7 +63,7 @@ func (svr *Server) Serve(listen chan error) error {
}()
for {
conn, err := svr.listener.Accept()
if svr.quit {
if svr.quit.Load() {
return ErrServerRequestedShutdown
}
if err == nil {
Expand All @@ -79,8 +81,10 @@ func (svr *Server) Serve(listen chan error) error {

// Shutdown stops the frontend.
func (svr *Server) Shutdown() error {
if !svr.quit {
svr.quit = true
svr.mu.Lock()
defer svr.mu.Unlock()
if !svr.quit.Load() {
svr.quit.Store(true)
if svr.listener != nil {
err := svr.listener.Close()
utils.LogErr("close listener", err)
Expand Down