make http accepter accept the next connection

while checking and redirecting an incoming connection

Author: zyxkad

cluster.go

@@ -306,6 +306,7 @@ func (cr *Cluster) Connect(ctx context.Context) bool {
 		logErrorf("Dial error: %v", err)
 		return false
 	}
+	logInfo("Connecting to socket.io namespace")
 	if err := cr.socket.Connect(""); err != nil {
 		logErrorf("Open namespace error: %v", err)
 		return false
@@ -440,7 +441,7 @@ func (cr *Cluster) disconnected() bool {
 	cr.mux.Lock()
 	defer cr.mux.Unlock()
 
-	if !cr.enabled.Swap(false) {
+	if cr.enabled.CompareAndSwap(true, false) {
 		return false
 	}
 	if cr.cancelKeepalive != nil {
@@ -669,7 +670,7 @@ type syncStats struct {
 
 func (cr *Cluster) SyncFiles(ctx context.Context, files []FileInfo, heavyCheck bool) bool {
 	logInfo("Preparing to sync files...")
-	if cr.issync.Swap(true) {
+	if !cr.issync.CompareAndSwap(false, true) {
 		logWarn("Another sync task is running!")
 		return false
 	}

http_listener.go

@@ -27,6 +27,7 @@ import (
 	"net/http"
 	"net/url"
 	"strconv"
+	"sync/atomic"
 	"time"
 )
 
@@ -39,6 +40,7 @@ type httpTLSListener struct {
 	TLSConfig *tls.Config
 	hosts     []string
 
+	accepting  atomic.Bool
 	acceptedCh chan net.Conn
 	errCh      chan error
 }
@@ -126,15 +128,16 @@ READ_HEAD:
 }
 
 func (s *httpTLSListener) accepter() {
-	for {
+	for s.accepting.CompareAndSwap(false, true) {
 		conn, err := s.Listener.Accept()
+		s.accepting.Store(false)
 		if err != nil {
 			s.errCh <- err
 			return
 		}
-		// TODO: start another accepter while reading this one
+		go s.accepter()
 		hr := &connHeadReader{Conn: conn}
-		hr.SetReadDeadline(time.Now().Add(time.Second))
+		hr.SetReadDeadline(time.Now().Add(time.Second * 5))
 		if !s.maybeRedirectConn(hr) {
 			hr.SetReadDeadline(time.Time{})
 			// if it's not a http connection, try it with tls and return