Skip to content

Commit 6f18c7f

Browse files
Updated from pipeline, Version : 24.0.2
1 parent df27d6f commit 6f18c7f

File tree

8 files changed

+48
-30
lines changed

8 files changed

+48
-30
lines changed

.variables

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
export LEVEL=CRITICAL
22
export REPO_NAME=justice-unreal-sdk-plugin
3-
export WORKDIR=/tmp/pipelines/5012724083/991733763/
4-
export COMMIT_HASH=9905dc0c2fbb5c164a7bcfbc05227700cc917799
5-
export GIT_HASH=9905dc0c2fbb5c164a7bcfbc05227700cc917799
6-
export VERSION=24.0.1
7-
export REVISION_ID=24.0.1
3+
export WORKDIR=/tmp/pipelines/5028228630/994460310/
4+
export COMMIT_HASH=5da909e3ccdbe35690b9152a655c328685f049c8
5+
export GIT_HASH=5da909e3ccdbe35690b9152a655c328685f049c8
6+
export VERSION=24.0.2
7+
export REVISION_ID=24.0.2
88
9-
export COMMIT_MESSAGE_BASE64='Y2hvcmUocmVsZWFzZSk6IDI0LjAuMSAtIGNvbW1pdGVkIGFuZCB0YWdnZWQgYnkgSmVua2lucwo='
9+
export COMMIT_MESSAGE_BASE64='Y2hvcmUocmVsZWFzZSk6IDI0LjAuMiAtIGNvbW1pdGVkIGFuZCB0YWdnZWQgYnkgSmVua2lucwo='

AccelByteUe4Sdk.uplugin

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"FileVersion": 3,
3-
"Version": 41,
4-
"VersionName": "24.0.1",
3+
"Version": 42,
4+
"VersionName": "24.0.2",
55
"FriendlyName": "AccelByte Unreal Engine SDK",
66
"Description": "Official AccelByte SDK for Unreal Engine 4",
77
"Category": "Online Platform",

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,14 @@
22

33
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
44

5+
### [24.0.2](https://bitbucket.org/accelbyte/justice-unreal-sdk-plugin/branches/compare/24.0.2%0D24.0.1) (2023-09-06)
6+
7+
8+
### Bug Fixes
9+
10+
* **AMS:** DS not connecting to amssim when launched using editor command line ([6fdf909](https://bitbucket.org/accelbyte/justice-unreal-sdk-plugin/commits/6fdf9092cfed1f940eab87c4362c4dab9c2ec6e9))
11+
* **AMS:** settings are not loaded on module startup ([309b213](https://bitbucket.org/accelbyte/justice-unreal-sdk-plugin/commits/309b2138dec27ae4a3fdded27c75eaa2d7abee0e))
12+
513
### [24.0.1](https://bitbucket.org/accelbyte/justice-unreal-sdk-plugin/branches/compare/24.0.1%0D24.0.0) (2023-09-04)
614

715

Content/CompatibilityMap.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@
4848
"maxVersion": "3.23.0"
4949
},
5050
"dsmcontroller": {
51-
"minVersion": "6.4.0",
52-
"maxVersion": "6.4.0"
51+
"minVersion": "6.4.1",
52+
"maxVersion": "6.4.1"
5353
},
5454
"game-telemetry": {
5555
"minVersion": "1.19.0",

Source/AccelByteUe4Sdk/Private/AccelByteUe4SdkModule.cpp

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -89,18 +89,19 @@ void FAccelByteUe4SdkModule::StartupModule()
8989
#endif
9090
AccelByte::FRegistry::ServerCredentials.Startup();
9191

92-
#if UE_SERVER
93-
FString ServerID;
94-
FParse::Value(FCommandLine::Get(), TEXT("dsid="), ServerID);
95-
if (ServerID.IsEmpty())
92+
if (IsRunningDedicatedServer())
9693
{
97-
UE_LOG(LogAccelByte, Warning, TEXT("dsid not provided, not connecting to AMS"));
98-
}
99-
else
100-
{
101-
AccelByte::FRegistry::ServerAMS.Connect();
94+
if (!AccelByte::FRegistry::ServerSettings.LoadAMSSettings())
95+
{
96+
UE_LOG(LogAccelByte, Warning, TEXT("dsid not provided, not connecting to AMS"));
97+
}
98+
else
99+
{
100+
AccelByte::FRegistry::ServerAMS.Connect();
101+
}
102102
}
103103

104+
#if UE_SERVER
104105
FAccelByteSignalHandler::Initialize();
105106
#endif
106107
}

Source/AccelByteUe4Sdk/Private/Core/AccelByteServerSettings.cpp

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
#include "Core/AccelByteServerSettings.h"
66
#include "Core/AccelByteRegistry.h"
7+
#include "Core/AccelByteUtilities.h"
78

89
using namespace AccelByte;
910

@@ -93,16 +94,7 @@ void ServerSettings::LoadSettings(const FString& SectionPath)
9394
QosPingTimeout = .6;
9495
}
9596

96-
FParse::Value(FCommandLine::Get(), TEXT("dsid="), DSId);
97-
if (!FParse::Value(FCommandLine::Get(), TEXT("watchdog_url="), AMSServerWatchdogUrl))
98-
{
99-
GConfig->GetString(*DefaultServerSection, TEXT("WatchdogUrl"), AMSServerWatchdogUrl, GEngineIni);
100-
}
101-
102-
if (!FParse::Value(FCommandLine::Get(), TEXT("heartbeat="), AMSHeartbeatInterval))
103-
{
104-
GConfig->GetInt(*DefaultServerSection, TEXT("AMSHeartbeatInterval"), AMSHeartbeatInterval, GEngineIni);
105-
}
97+
LoadAMSSettings();
10698

10799
LoadFallback(SectionPath, TEXT("StatsDUrl"), StatsDServerUrl);
108100
FString StatsDPortString;
@@ -168,6 +160,21 @@ void ServerSettings::Reset(ESettingsEnvironment const Environment)
168160
LoadSettings(SectionPath);
169161
}
170162

163+
bool AccelByte::ServerSettings::LoadAMSSettings()
164+
{
165+
if (!FAccelByteUtilities::GetValueFromCommandLineSwitch(TEXT("watchdog_url"), AMSServerWatchdogUrl))
166+
{
167+
GConfig->GetString(*DefaultServerSection, TEXT("WatchdogUrl"), AMSServerWatchdogUrl, GEngineIni);
168+
}
169+
170+
if (!FAccelByteUtilities::GetValueFromCommandLineSwitch(TEXT("heartbeat"), AMSHeartbeatInterval))
171+
{
172+
GConfig->GetInt(*DefaultServerSection, TEXT("AMSHeartbeatInterval"), AMSHeartbeatInterval, GEngineIni);
173+
}
174+
175+
return FAccelByteUtilities::GetValueFromCommandLineSwitch(TEXT("dsid"), DSId);
176+
}
177+
171178
FString UAccelByteBlueprintsServerSettings::GetClientId()
172179
{
173180
return FRegistry::ServerSettings.ClientId;

Source/AccelByteUe4Sdk/Public/Core/AccelByteServerSettings.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ class ACCELBYTEUE4SDK_API ServerSettings : public BaseSettings
2727

2828
virtual void Reset(ESettingsEnvironment const Environment) override;
2929

30+
bool LoadAMSSettings();
31+
3032
ServerSettings& operator=(ServerSettings const& Other) = default;
3133

3234
protected:

version.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"version": "24.0.1"
2+
"version": "24.0.2"
33
}

0 commit comments

Comments
 (0)