Merge pull request #383 from snowAvocado/merge-engine-to-server

Merge Engine with Server
gatewayd-io · Dec 24, 2023 · 890d562 · 890d562
2 parents 23dea16 + 214afaf
commit 890d562
Show file tree

Hide file tree

Showing 6 changed files with 73 additions and 161 deletions.
diff --git a/cmd/run.go b/cmd/run.go
@@ -128,7 +128,7 @@ func StopGracefully(
 	}
 	for name, server := range servers {
 		logger.Info().Str("name", name).Msg("Stopping server")
-		server.Shutdown() //nolint:contextcheck
+		server.Shutdown()
 		span.AddEvent("Stopped server")
 	}
 	logger.Info().Msg("Stopped all servers")

diff --git a/config/constants.go b/config/constants.go
@@ -123,7 +123,6 @@ const (
 	DefaultTCPKeepAliveDuration = 3 * time.Second
 	DefaultLoadBalancer         = "roundrobin"
 	DefaultTCPNoDelay           = true
-	DefaultEngineStopTimeout    = 5 * time.Second
 	DefaultHandshakeTimeout     = 5 * time.Second
 
 	// Utility constants.

diff --git a/network/engine.go b/network/engine.go
diff --git a/network/engine_test.go b/network/engine_test.go