Commit 9e5e79e5 authored by Andrei Mihu's avatar Andrei Mihu
Browse files

Prioritise gateway timeout over idle timeout.

parent e3f93b27

server/api.go

+6 −1
Original line number Diff line number Diff line
@@ -77,7 +77,12 @@ type ApiServer struct { 
}



func StartApiServer(logger *zap.Logger, startupLogger *zap.Logger, db *sql.DB, jsonpbMarshaler *jsonpb.Marshaler, jsonpbUnmarshaler *jsonpb.Unmarshaler, config Config, socialClient *social.Client, leaderboardCache LeaderboardCache, leaderboardRankCache LeaderboardRankCache, sessionRegistry *SessionRegistry, matchRegistry MatchRegistry, matchmaker Matchmaker, tracker Tracker, router MessageRouter, pipeline *Pipeline, runtime *Runtime) *ApiServer {

	if config.GetSocket().IdleTimeoutMs > 500 {

		// Ensure the GRPC Gateway timeout is just under the idle timeout (if possible) to ensure it has priority.

		grpcRuntime.DefaultContextTimeout = time.Duration(config.GetSocket().IdleTimeoutMs-500) * time.Millisecond

	} else {

		grpcRuntime.DefaultContextTimeout = time.Duration(config.GetSocket().IdleTimeoutMs) * time.Millisecond

	}



	serverOpts := []grpc.ServerOption{

		grpc.StatsHandler(&ocgrpc.ServerHandler{IsPublicEndpoint: true}),