diff --git a/Source/DedicatedServers/Private/Game/DS_GameMode.cpp b/Source/DedicatedServers/Private/Game/DS_GameMode.cpp index 7fbfd44b..ec695b12 100644 --- a/Source/DedicatedServers/Private/Game/DS_GameMode.cpp +++ b/Source/DedicatedServers/Private/Game/DS_GameMode.cpp @@ -33,7 +33,6 @@ void ADS_GameMode::BeginPlay() void ADS_GameMode::InitGame(const FString& MapName, const FString& Options, FString& ErrorMessage) { Super::InitGame(MapName, Options, ErrorMessage); - UE_LOGFMT(LogTemp, Error, "We got into InitGame of ADS_GameMode"); #if WITH_GAMELIFT CachedCommandLine = FCommandLine::Get(); diff --git a/Source/DedicatedServers/Private/UI/HTTP/HTTPRequestTypes.cpp b/Source/DedicatedServers/Private/UI/HTTP/HTTPRequestTypes.cpp index 1863d1a3..758a0b16 100644 --- a/Source/DedicatedServers/Private/UI/HTTP/HTTPRequestTypes.cpp +++ b/Source/DedicatedServers/Private/UI/HTTP/HTTPRequestTypes.cpp @@ -37,8 +37,8 @@ void FDSGameSession::Dump() const UE_LOGFMT(LogDedicatedServers, Log, "GameSessionId: {GameSessionId}", *GameSessionId); UE_LOGFMT(LogDedicatedServers, Log, " Name: {Name}", *Name); UE_LOGFMT(LogDedicatedServers, Log, " FleetArn: {FleetArn}", *FleetArn); - UE_LOGFMT(LogDedicatedServers, Log, " CreationTime: {CreationTime}", CreationTime); // need to write a conversion function - UE_LOGFMT(LogDedicatedServers, Log, " TerminationTime: {TerminationTime}", TerminationTime); // need to write a conversion function + UE_LOGFMT(LogDedicatedServers, Log, " CreationTime: {CreationTime}", *CreationTime); // need to write a conversion function + UE_LOGFMT(LogDedicatedServers, Log, " TerminationTime: {TerminationTime}", *TerminationTime); // need to write a conversion function UE_LOGFMT(LogDedicatedServers, Log, " CurrentPlayerSessionCount: {CurrentPlayerSessionCount}", CurrentPlayerSessionCount); UE_LOGFMT(LogDedicatedServers, Log, " MaximumPlayerSessionCount: {MaximumPlayerSessionCount}", MaximumPlayerSessionCount); UE_LOGFMT(LogDedicatedServers, Log, " Status: {Status}", *Status); @@ -75,6 +75,6 @@ void FDSPlayerSession::Dump() const UE_LOGFMT(LogDedicatedServers, Log, " Port: {Port}", Port); UE_LOGFMT(LogDedicatedServers, Log, " Status: {Status}", *Status); UE_LOGFMT(LogDedicatedServers, Log, " PlayerData: {PlayerData}", *PlayerData); - UE_LOGFMT(LogDedicatedServers, Log, " CreationTime: {CreationTime}", CreationTime); - UE_LOGFMT(LogDedicatedServers, Log, " TerminationTime: {TerminationTime}", TerminationTime); + UE_LOGFMT(LogDedicatedServers, Log, " CreationTime: {CreationTime}", *CreationTime); + UE_LOGFMT(LogDedicatedServers, Log, " TerminationTime: {TerminationTime}", *TerminationTime); } diff --git a/Source/DedicatedServers/Private/UI/Portal/PortalManager.cpp b/Source/DedicatedServers/Private/UI/Portal/PortalManager.cpp index ebeb6977..d6da2668 100644 --- a/Source/DedicatedServers/Private/UI/Portal/PortalManager.cpp +++ b/Source/DedicatedServers/Private/UI/Portal/PortalManager.cpp @@ -145,5 +145,23 @@ void UPortalManager::TryCreatePlayerSession(const FString& PlayerId, const FStri void UPortalManager::FindPlayerSession_Response(FHttpRequestPtr Request, FHttpResponsePtr Response, bool bWasSuccessful) { - GEngine->AddOnScreenDebugMessage(-1, 5.f, FColor::Red, TEXT("Create Player Session Response Received...")); + if (!bWasSuccessful) + { + BroadcastJoinGameSessionMessage.Broadcast(HTTPStatusMessages::SomethingWentWrong, true); + } + + TSharedPtr JsonObject; + TSharedRef> JsonReader = TJsonReaderFactory<>::Create(Response->GetContentAsString()); + if (FJsonSerializer::Deserialize(JsonReader, JsonObject)) + { + if (ContainsErrors(JsonObject)) + { + BroadcastJoinGameSessionMessage.Broadcast(HTTPStatusMessages::SomethingWentWrong, true); + } + + FDSPlayerSession PlayerSession; + FJsonObjectConverter::JsonObjectToUStruct(JsonObject.ToSharedRef(), &PlayerSession); + + PlayerSession.Dump(); + } } diff --git a/Source/DedicatedServers/Public/UI/HTTP/HTTPRequestTypes.h b/Source/DedicatedServers/Public/UI/HTTP/HTTPRequestTypes.h index 7b72d645..6ca306ba 100644 --- a/Source/DedicatedServers/Public/UI/HTTP/HTTPRequestTypes.h +++ b/Source/DedicatedServers/Public/UI/HTTP/HTTPRequestTypes.h @@ -56,10 +56,10 @@ struct FDSGameSession FString FleetArn{}; UPROPERTY() - double CreationTime{}; + FString CreationTime{}; UPROPERTY() - double TerminationTime{}; + FString TerminationTime{}; UPROPERTY() int32 CurrentPlayerSessionCount{}; @@ -116,7 +116,7 @@ struct FDSPlayerSession /** Unix timestamp for when the player session was created */ UPROPERTY() - int64 CreationTime{}; + FString CreationTime{}; UPROPERTY() FString DnsName{}; @@ -152,7 +152,7 @@ struct FDSPlayerSession /** Unix timestamp for when the player session was terminated (0 if still active) */ UPROPERTY() - int64 TerminationTime{}; + FString TerminationTime{}; void Dump() const; };