Console users handler functions. (#310) (1733e6ba) · Commits · public-projects / Nakama

console/console.pb.go

+168 −168

File changed.

Preview size limit exceeded, changes collapsed.

console/console.proto

+5 −5

Original line number	Diff line number	Diff line
		@@ -335,16 +335,16 @@ message ListUsersRequest {
		bool banned = 2;
		// Search only recorded deletes.
		bool tombstones = 3;
		// An (optional) cursor to fetch next page.
		bytes cursor = 4;
		}

		// List of storage objects.
		message StorageList {
		// List of storage objects matching list/filter operation.
		repeated nakama.api.StorageObject objects = 1;
		// Approximate total number of storage objects.
		int32 total_count = 2;
		// An (optional) cursor for paging results.
		bytes cursor = 2;
		bytes cursor = 3;
		}

		// Unlink a particular device ID from a user's account.
		@@ -387,8 +387,8 @@ message UpdateAccountRequest {
		message UserList {
		// A list of users.
		repeated nakama.api.User users = 1;
		// A cursor to fetch more results.
		bytes cursor = 2;
		// Approximate total number of users.
		int32 total_count = 2;
		}

		// List of nodes and their stats.

console/console.swagger.json

+9 −12

Original line number	Diff line number	Diff line
		@@ -813,14 +813,6 @@
		"required": false,
		"type": "boolean",
		"format": "boolean"
		},
		{
		"name": "cursor",
		"description": "An (optional) cursor to fetch next page.",
		"in": "query",
		"required": false,
		"type": "string",
		"format": "byte"
		}
		],
		"tags": [
		@@ -1496,6 +1488,11 @@
		},
		"description": "List of storage objects matching list/filter operation."
		},
		"total_count": {
		"type": "integer",
		"format": "int32",
		"description": "Approximate total number of storage objects."
		},
		"cursor": {
		"type": "string",
		"format": "byte",
		@@ -1514,10 +1511,10 @@
		},
		"description": "A list of users."
		},
		"cursor": {
		"type": "string",
		"format": "byte",
		"description": "A cursor to fetch more results."
		"total_count": {
		"type": "integer",
		"format": "int32",
		"description": "Approximate total number of users."
		}
		},
		"description": "A list of users."

main.go

+1 −1

Original line number	Diff line number	Diff line
		@@ -118,7 +118,7 @@ func main() {
		pipeline := server.NewPipeline(logger, config, db, jsonpbMarshaler, jsonpbUnmarshaler, sessionRegistry, matchRegistry, matchmaker, tracker, router, runtime)
		metrics := server.NewMetrics(logger, startupLogger, config)

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

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

server/api.go

+12 −3

Original line number	Diff line number	Diff line
		@@ -124,7 +124,7 @@ func StartApiServer(logger zap.Logger, startupLogger zap.Logger, db *sql.DB, j
		apigrpc.RegisterNakamaServer(grpcServer, s)
		startupLogger.Info("Starting API server for gRPC requests", zap.Int("port", config.GetSocket().Port-1))
		go func() {
		listener, err := net.Listen("tcp", fmt.Sprintf(":%d", config.GetSocket().Port-1))
		listener, err := net.Listen("tcp", fmt.Sprintf("%v:%d", config.GetSocket().Address, config.GetSocket().Port-1))
		if err != nil {
		startupLogger.Fatal("API server listener failed to start", zap.Error(err))
		}
		@@ -157,6 +157,9 @@ func StartApiServer(logger zap.Logger, startupLogger zap.Logger, db *sql.DB, j
		}),
		)
		dialAddr := fmt.Sprintf("127.0.0.1:%d", config.GetSocket().Port-1)
		if config.GetSocket().Address != "" {
		dialAddr = fmt.Sprintf("%v:%d", config.GetSocket().Address, config.GetSocket().Port-1)
		}
		dialOpts := []grpc.DialOption{
		//TODO (mo, zyro): Do we need to pass the statsHandler here as well?
		grpc.WithDefaultCallOptions(grpc.MaxCallSendMsgSize(int(config.GetSocket().MaxMessageSizeBytes))),
		@@ -230,9 +233,15 @@ func StartApiServer(logger zap.Logger, startupLogger zap.Logger, db *sql.DB, j
		startupLogger.Fatal("API server gateway listener failed to start", zap.Error(err))
		}

		if config.GetSocket().TLSCert != nil {
		if err := s.grpcGatewayServer.ServeTLS(listener, "", ""); err != nil && err != http.ErrServerClosed {
		startupLogger.Fatal("API server gateway listener failed", zap.Error(err))
		}
		} else {
		if err := s.grpcGatewayServer.Serve(listener); err != nil && err != http.ErrServerClosed {
		startupLogger.Fatal("API server gateway listener failed", zap.Error(err))
		}
		}
		}()

		return s