Fix a few other goroutine leaks with contexts

5 files changed, 35 insertions, 29 deletions

diff --git a/forged/internal/incoming/hooks/hooks.go b/forged/internal/incoming/hooks/hooks.go
index c021406..3be0811 100644
--- a/forged/internal/incoming/hooks/hooks.go
+++ b/forged/internal/incoming/hooks/hooks.go
@@ -2,6 +2,7 @@ package hooks
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"net"
 
@@ -59,7 +60,9 @@ func (server *Server) Run(ctx context.Context) error {
 	for {
 		conn, err := listener.Accept()
 		if err != nil {
-			// TODO: Handle errors caused by context cancel
+			if errors.Is(err, net.ErrClosed) {
+				return nil
+			}
 			return fmt.Errorf("accept conn: %w", err)
 		}
 
diff --git a/forged/internal/incoming/lmtp/config.go b/forged/internal/incoming/lmtp/config.go
index c622648..ce32f3d 100644
--- a/forged/internal/incoming/lmtp/config.go
+++ b/forged/internal/incoming/lmtp/config.go
@@ -2,6 +2,7 @@ package lmtp
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"net"
 
@@ -52,6 +53,9 @@ func (server *Server) Run(ctx context.Context) error {
 	for {
 		conn, err := listener.Accept()
 		if err != nil {
+			if errors.Is(err, net.ErrClosed) {
+				return nil
+			}
 			return fmt.Errorf("accept conn: %w", err)
 		}
 
diff --git a/forged/internal/incoming/ssh/ssh.go b/forged/internal/incoming/ssh/ssh.go
index efa24f1..77812d1 100644
--- a/forged/internal/incoming/ssh/ssh.go
+++ b/forged/internal/incoming/ssh/ssh.go
@@ -2,6 +2,7 @@ package ssh
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"os"
 
@@ -68,6 +69,9 @@ func (server *Server) Run(ctx context.Context) (err error) {
 	}()
 
 	if err = server.gliderServer.Serve(listener); err != nil {
+		if errors.Is(err, gliderssh.ErrServerClosed) {
+			return nil
+		}
 		return fmt.Errorf("serve SSH: %w", err)
 	}
 	panic("unreachable")
diff --git a/forged/internal/incoming/web/web.go b/forged/internal/incoming/web/web.go
index a95b650..f66ad64 100644
--- a/forged/internal/incoming/web/web.go
+++ b/forged/internal/incoming/web/web.go
@@ -63,6 +63,9 @@ func (server *Server) Run(ctx context.Context) (err error) {
 	}()
 
 	if err = server.httpServer.Serve(listener); err != nil {
+		if err == http.ErrServerClosed {
+			return nil
+		}
 		return fmt.Errorf("serve web: %w", err)
 	}
 	panic("unreachable")
diff --git a/forged/internal/server/server.go b/forged/internal/server/server.go
index 867e54f..472df7a 100644
--- a/forged/internal/server/server.go
+++ b/forged/internal/server/server.go
@@ -62,46 +62,38 @@ func (server *Server) Run(ctx context.Context) (err error) {
 	errCh := make(chan error)
 
 	go func() {
-		err := server.hookServer.Run(subCtx)
-		if err == nil {
-			panic("hook server should never return nil error")
-		}
-		select {
-		case errCh <- err:
-		default:
+		if err := server.hookServer.Run(subCtx); err != nil {
+			select {
+			case errCh <- err:
+			default:
+			}
 		}
 	}()
 
 	go func() {
-		err := server.lmtpServer.Run(subCtx)
-		if err == nil {
-			panic("lmtp server should never return nil error")
-		}
-		select {
-		case errCh <- err:
-		default:
+		if err := server.lmtpServer.Run(subCtx); err != nil {
+			select {
+			case errCh <- err:
+			default:
+			}
 		}
 	}()
 
 	go func() {
-		err := server.webServer.Run(subCtx)
-		if err == nil {
-			panic("web server should never return nil error")
-		}
-		select {
-		case errCh <- err:
-		default:
+		if err := server.webServer.Run(subCtx); err != nil {
+			select {
+			case errCh <- err:
+			default:
+			}
 		}
 	}()
 
 	go func() {
-		err := server.sshServer.Run(subCtx)
-		if err == nil {
-			panic("ssh server should never return nil error")
-		}
-		select {
-		case errCh <- err:
-		default:
+		if err := server.sshServer.Run(subCtx); err != nil {
+			select {
+			case errCh <- err:
+			default:
+			}
 		}
 	}()