Skip to content

Fix race between Server.Serve() and Server.Close() #360

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
0pcom merged 1 commit into from
Mar 30, 2026
Merged

Fix race between Server.Serve() and Server.Close() #360

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
11 changes: 10 additions & 1 deletion pkg/dmsg/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package dmsg

import (
"context"
"errors"
"net"
"sync"
"time"
Expand All @@ -17,6 +18,9 @@ import (
"github.com/skycoin/dmsg/pkg/dmsg/metrics"
)

// ErrClosed is returned when an operation is attempted on a closed server.
var ErrClosed = errors.New("server closed")

// PeerEntry represents a peer dmsg server to connect to.
type PeerEntry struct {
PK cipher.PubKey
Expand Down Expand Up @@ -156,7 +160,12 @@ func (s *Server) Serve(lis net.Listener, addr string) error {
WithField("local_pk", s.pk)

log.Info("Serving server.")
s.wg.Add(1)
select {
case <-s.done:
return ErrClosed
default:
s.wg.Add(1)
}
defer func() {
log.Info("Stopped server.")
s.wg.Done()
Expand Down
Loading