Unverified Commit b20c41ac authored by Andrei Mihu's avatar Andrei Mihu Committed by GitHub
Browse files

Expose server version in runtime contexts. (#928)

parent a0c8c122

data/modules/runonce_check.lua

+0 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ local nk = require("nakama") 


nk.run_once(function(context)

  assert(context.execution_mode, "run_once")



--   nk.match_create("match", {debug = true, label = "{\"foo\":123}"})

end)

go.mod

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ require ( 
	github.com/gorilla/mux v1.8.0

	github.com/gorilla/websocket v1.4.2

	github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0

	github.com/heroiclabs/nakama-common v0.0.0-20220924190342-952ca53f7a22

	github.com/heroiclabs/nakama-common v0.0.0-20221007130012-74541b4d1596

	github.com/jackc/pgconn v1.10.0

	github.com/jackc/pgerrcode v0.0.0-20201024163028-a0d42d470451

	github.com/jackc/pgtype v1.8.1

go.sum

+2 −2
Original line number Diff line number Diff line
@@ -291,8 +291,8 @@ github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO 
github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ=

github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I=

github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc=

github.com/heroiclabs/nakama-common v0.0.0-20220924190342-952ca53f7a22 h1:XR84oFHAQRqz/vzV4V0XzPEM27h43Zo8q+ApqIWynFU=

github.com/heroiclabs/nakama-common v0.0.0-20220924190342-952ca53f7a22/go.mod h1:WF4YG46afwY3ibzsXnkt3zvhQ3tBY03IYeU7xSLr8HE=

github.com/heroiclabs/nakama-common v0.0.0-20221007130012-74541b4d1596 h1:7p7XAW1d3qbNaP+8dN/5SwTBv4HBo7uKRY/yg6NahNM=

github.com/heroiclabs/nakama-common v0.0.0-20221007130012-74541b4d1596/go.mod h1:WF4YG46afwY3ibzsXnkt3zvhQ3tBY03IYeU7xSLr8HE=

github.com/huandu/xstrings v1.3.2/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=

github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=

github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=

main.go

+3 −3
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ func main() { 
			}

			config.GetRuntime().Path = runtimePath



			if err := server.CheckRuntime(tmpLogger, config); err != nil {

			if err := server.CheckRuntime(tmpLogger, config, version); err != nil {

				// Errors are already logged in the function above.

				os.Exit(1)

			}
@@ -153,7 +153,7 @@ func main() { 
	tracker.SetMatchJoinListener(matchRegistry.Join)

	tracker.SetMatchLeaveListener(matchRegistry.Leave)

	streamManager := server.NewLocalStreamManager(config, sessionRegistry, tracker)

	runtime, runtimeInfo, err := server.NewRuntime(ctx, logger, startupLogger, db, jsonpbMarshaler, jsonpbUnmarshaler, config, socialClient, leaderboardCache, leaderboardRankCache, leaderboardScheduler, sessionRegistry, sessionCache, statusRegistry, matchRegistry, tracker, metrics, streamManager, router)

	runtime, runtimeInfo, err := server.NewRuntime(ctx, logger, startupLogger, db, jsonpbMarshaler, jsonpbUnmarshaler, config, version, socialClient, leaderboardCache, leaderboardRankCache, leaderboardScheduler, sessionRegistry, sessionCache, statusRegistry, matchRegistry, tracker, metrics, streamManager, router)

	if err != nil {

		startupLogger.Fatal("Failed initializing runtime modules", zap.Error(err))

	}
@@ -167,7 +167,7 @@ func main() { 
	pipeline := server.NewPipeline(logger, config, db, jsonpbMarshaler, jsonpbUnmarshaler, sessionRegistry, statusRegistry, matchRegistry, partyRegistry, matchmaker, tracker, router, runtime)

	statusHandler := server.NewLocalStatusHandler(logger, sessionRegistry, matchRegistry, tracker, metrics, config.GetName())



	apiServer := server.StartApiServer(logger, startupLogger, db, jsonpbMarshaler, jsonpbUnmarshaler, config, socialClient, leaderboardCache, leaderboardRankCache, sessionRegistry, sessionCache, statusRegistry, matchRegistry, matchmaker, tracker, router, streamManager, metrics, pipeline, runtime)

	apiServer := server.StartApiServer(logger, startupLogger, db, jsonpbMarshaler, jsonpbUnmarshaler, config, version, socialClient, leaderboardCache, leaderboardRankCache, sessionRegistry, sessionCache, statusRegistry, matchRegistry, matchmaker, tracker, router, streamManager, metrics, pipeline, runtime)

	consoleServer := server.StartConsoleServer(logger, startupLogger, db, config, tracker, router, streamManager, metrics, sessionCache, consoleSessionCache, loginAttemptCache, statusRegistry, statusHandler, runtimeInfo, matchRegistry, configWarnings, semver, leaderboardCache, leaderboardRankCache, apiServer, cookie)



	gaenabled := len(os.Getenv("NAKAMA_TELEMETRY")) < 1

server/api.go

+3 −1
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ type ApiServer struct { 
	logger               *zap.Logger

	db                   *sql.DB

	config               Config

	version              string

	socialClient         *social.Client

	leaderboardCache     LeaderboardCache

	leaderboardRankCache LeaderboardRankCache
@@ -81,7 +82,7 @@ type ApiServer struct { 
	grpcGatewayServer    *http.Server

}



func StartApiServer(logger *zap.Logger, startupLogger *zap.Logger, db *sql.DB, protojsonMarshaler *protojson.MarshalOptions, protojsonUnmarshaler *protojson.UnmarshalOptions, config Config, socialClient *social.Client, leaderboardCache LeaderboardCache, leaderboardRankCache LeaderboardRankCache, sessionRegistry SessionRegistry, sessionCache SessionCache, statusRegistry *StatusRegistry, matchRegistry MatchRegistry, matchmaker Matchmaker, tracker Tracker, router MessageRouter, streamManager StreamManager, metrics Metrics, pipeline *Pipeline, runtime *Runtime) *ApiServer {

func StartApiServer(logger *zap.Logger, startupLogger *zap.Logger, db *sql.DB, protojsonMarshaler *protojson.MarshalOptions, protojsonUnmarshaler *protojson.UnmarshalOptions, config Config, version string, socialClient *social.Client, leaderboardCache LeaderboardCache, leaderboardRankCache LeaderboardRankCache, sessionRegistry SessionRegistry, sessionCache SessionCache, statusRegistry *StatusRegistry, matchRegistry MatchRegistry, matchmaker Matchmaker, tracker Tracker, router MessageRouter, streamManager StreamManager, metrics Metrics, pipeline *Pipeline, runtime *Runtime) *ApiServer {

	var gatewayContextTimeoutMs string

	if config.GetSocket().IdleTimeoutMs > 500 {

		// Ensure the GRPC Gateway timeout is just under the idle timeout (if possible) to ensure it has priority.
@@ -112,6 +113,7 @@ func StartApiServer(logger *zap.Logger, startupLogger *zap.Logger, db *sql.DB, p 
		logger:               logger,

		db:                   db,

		config:               config,

		version:              version,

		socialClient:         socialClient,

		leaderboardCache:     leaderboardCache,

		leaderboardRankCache: leaderboardRankCache,