Commit b3085c6a authored by Mo Firouz's avatar Mo Firouz
Browse files

Update console auth and database start script.

parent b5d04f14

build/db_start

+1 −1
Original line number Diff line number Diff line
@@ -18,4 +18,4 @@ set -o errexit 
set -o nounset

set -o pipefail



cockroach start --background --insecure --store=attrs=ssd,path=/tmp/cockroach
 
cockroach start-single-node --background --insecure --store=attrs=ssd,path=/tmp/cockroach

console/a_console-packr.go

+2 −2

File changed.

Preview size limit exceeded, changes collapsed.

console/ui/src/app/authentication.service.ts

+1 −0
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ export class AuthenticationService { 
    const _ = this.segment.identify(null, {

      "username": claims['usn'],

      "email": claims['ema'],

      "cookie": claims['cki'],

    });

  }

}

main.go

+2 −2
Original line number Diff line number Diff line
@@ -126,6 +126,7 @@ func main() { 
	socialClient := social.NewClient(logger, 5*time.Second)



	// Start up server components.

	cookie := newOrLoadCookie(config)

	metrics := server.NewMetrics(logger, startupLogger, config)

	sessionRegistry := server.NewLocalSessionRegistry(metrics)

	tracker := server.StartLocalTracker(logger, config, sessionRegistry, metrics, jsonpbMarshaler)
@@ -149,10 +150,9 @@ func main() { 
	statusHandler := server.NewLocalStatusHandler(logger, sessionRegistry, matchRegistry, tracker, metrics, config.GetName())



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

	consoleServer := server.StartConsoleServer(logger, startupLogger, db, config, tracker, router, statusHandler, runtimeInfo, matchRegistry, configWarnings, semver, leaderboardCache, leaderboardRankCache, apiServer)

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



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

	cookie := newOrLoadCookie(config)

	const gacode = "UA-89792135-1"

	var telemetryClient *http.Client

	if gaenabled {

server/console.go

+3 −1
Original line number Diff line number Diff line
@@ -78,9 +78,10 @@ type ConsoleServer struct { 
	leaderboardRankCache LeaderboardRankCache

	api                  *ApiServer

	rpcMethodCache       *rpcReflectCache

	cookie               string

}



func StartConsoleServer(logger *zap.Logger, startupLogger *zap.Logger, db *sql.DB, config Config, tracker Tracker, router MessageRouter, statusHandler StatusHandler, runtimeInfo *RuntimeInfo, matchRegistry MatchRegistry, configWarnings map[string]string, serverVersion string, leaderboardCache LeaderboardCache, leaderboardRankCache LeaderboardRankCache, api *ApiServer) *ConsoleServer {

func StartConsoleServer(logger *zap.Logger, startupLogger *zap.Logger, db *sql.DB, config Config, tracker Tracker, router MessageRouter, statusHandler StatusHandler, runtimeInfo *RuntimeInfo, matchRegistry MatchRegistry, configWarnings map[string]string, serverVersion string, leaderboardCache LeaderboardCache, leaderboardRankCache LeaderboardRankCache, api *ApiServer, cookie string) *ConsoleServer {

	var gatewayContextTimeoutMs string

	if config.GetConsole().IdleTimeoutMs > 500 {

		// Ensure the GRPC Gateway timeout is just under the idle timeout (if possible) to ensure it has priority.
@@ -114,6 +115,7 @@ func StartConsoleServer(logger *zap.Logger, startupLogger *zap.Logger, db *sql.D 
		leaderboardCache:     leaderboardCache,

		leaderboardRankCache: leaderboardRankCache,

		api:                  api,

		cookie:               cookie,

	}



	if err := s.initRpcMethodCache(); err != nil {