refactor

Author: evgeniy-scherbina

boundary.go

@@ -62,12 +62,11 @@ func (b *Boundary) Start() error {
 	}
 
 	// Start proxy server in background
-	go func() {
-		err := b.proxyServer.Start(b.ctx)
-		if err != nil {
-			b.logger.Error("Proxy server error", "error", err)
-		}
-	}()
+	err = b.proxyServer.Start()
+	if err != nil {
+		b.logger.Error("Proxy server error", "error", err)
+		return err
+	}
 
 	// Give proxy time to start
 	time.Sleep(100 * time.Millisecond)
@@ -90,4 +89,4 @@ func (b *Boundary) Close() error {
 
 	// Close jailer
 	return b.jailer.Close()
-}
+}

proxy/proxy_test.go

@@ -59,11 +59,9 @@ func TestProxyServerBasicHTTP(t *testing.T) {
 		TLSConfig:  tlsConfig,
 	})
 
-	// Start server in goroutine
-	serverDone := make(chan error, 1)
-	go func() {
-		serverDone <- server.Start()
-	}()
+	// Start server
+	err = server.Start()
+	require.NoError(t, err)
 
 	// Give server time to start
 	time.Sleep(100 * time.Millisecond)
@@ -107,8 +105,6 @@ func TestProxyServerBasicHTTP(t *testing.T) {
 
 	err = server.Stop()
 	require.NoError(t, err)
-	err = <-serverDone
-	require.NoError(t, err)
 }
 
 // TestProxyServerBasicHTTPS tests basic HTTPS request handling
@@ -161,11 +157,9 @@ func TestProxyServerBasicHTTPS(t *testing.T) {
 		TLSConfig:  tlsConfig,
 	})
 
-	// Start server in goroutine
-	serverDone := make(chan error, 1)
-	go func() {
-		serverDone <- server.Start()
-	}()
+	// Start server
+	err = server.Start()
+	require.NoError(t, err)
 
 	// Give server time to start
 	time.Sleep(100 * time.Millisecond)
@@ -205,6 +199,4 @@ func TestProxyServerBasicHTTPS(t *testing.T) {
 
 	err = server.Stop()
 	require.NoError(t, err)
-	err = <-serverDone
-	require.NoError(t, err)
 }