Skip to content

Commit 3e10737

Browse files
committed
* added support for overriding app_id for mirrored endpoints
1 parent c579396 commit 3e10737

File tree

3 files changed

+11
-9
lines changed

3 files changed

+11
-9
lines changed

Assets/OGD-Unity/FieldDay/Logging/OGDLog.cs

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,7 @@ private enum UploadResultType {
194194
private FirebaseConsts m_FirebaseConsts;
195195
private SessionConsts m_SessionConsts;
196196
private string m_MirroringURL;
197+
private string m_MirroringAppIdOverride;
197198
private SchedulingConfig m_SchedulingConfig;
198199

199200
// state
@@ -524,12 +525,13 @@ public void UseFirebase(string constantsJSON) {
524525
/// <summary>
525526
/// Sets the logger to mirror log output to another endpoint.
526527
/// </summary>
527-
public void ConfigureMirroring(string mirrorUrl) {
528-
if (m_MirroringURL != mirrorUrl) {
528+
public void ConfigureMirroring(string mirrorUrl, string overrideAppId = null) {
529+
if (m_MirroringURL != mirrorUrl || m_MirroringAppIdOverride != overrideAppId) {
529530
m_MirroringURL = mirrorUrl;
531+
m_MirroringAppIdOverride = overrideAppId;
530532

531533
if (!string.IsNullOrEmpty(m_MirroringURL)) {
532-
m_MirrorEndpoint = BuildOGDUrl(m_OGDConsts, m_SessionConsts, m_MirroringURL);
534+
m_MirrorEndpoint = BuildOGDUrl(m_OGDConsts, m_SessionConsts, m_MirroringURL, m_MirroringAppIdOverride);
533535
if (m_MirrorEndpoint != null) {
534536
m_MirrorStreamState.CleanActivate();
535537
} else {
@@ -580,9 +582,9 @@ private void SetModuleStatus(ModuleId module, ModuleStatus status) {
580582
/// </summary>
581583
[MethodImpl(256)]
582584
private void RefreshEndpointUris() {
583-
m_Endpoint = BuildOGDUrl(m_OGDConsts, m_SessionConsts, null);
585+
m_Endpoint = BuildOGDUrl(m_OGDConsts, m_SessionConsts, null, null);
584586
if (!string.IsNullOrEmpty(m_MirroringURL)) {
585-
m_MirrorEndpoint = BuildOGDUrl(m_OGDConsts, m_SessionConsts, m_MirroringURL);
587+
m_MirrorEndpoint = BuildOGDUrl(m_OGDConsts, m_SessionConsts, m_MirroringURL, m_MirroringAppIdOverride);
586588
} else {
587589
m_MirrorEndpoint = null;
588590
}
@@ -1703,13 +1705,13 @@ private void TryScheduleFlush(float delay) {
17031705

17041706
#region String Assembly
17051707

1706-
static private unsafe Uri BuildOGDUrl(OGDLogConsts ogdConsts, SessionConsts session, string overrideUrl) {
1708+
static private unsafe Uri BuildOGDUrl(OGDLogConsts ogdConsts, SessionConsts session, string overrideUrl, string overrideAppId) {
17071709
char* buffer = stackalloc char[512];
17081710
FixedCharBuffer charBuff = new FixedCharBuffer("url", buffer, 512);
17091711

17101712
charBuff.Write(overrideUrl ?? OGDLogConsts.LogEndpoint);
17111713
charBuff.Write("?app_id=");
1712-
charBuff.Write(Uri.EscapeDataString(ogdConsts.AppId.ToUpperInvariant()));
1714+
charBuff.Write(Uri.EscapeDataString((overrideAppId ?? ogdConsts.AppId).ToUpperInvariant()));
17131715
charBuff.Write("&log_version=");
17141716
charBuff.Write(ogdConsts.ClientLogVersion);
17151717
charBuff.Write("&app_version=");

Assets/OGD-Unity/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "com.fieldday.opengamedata-unity",
33
"displayName": "opengamedata-unity",
4-
"version": "1.0.8",
4+
"version": "1.0.9",
55
"unity": "2018.4",
66
"dependencies": {
77
}

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ Logging to Firebase for Android or iOS will require an additional Unity package.
161161

162162
### Mirroring
163163

164-
You can mirror your OpenGameData events to a secondary endpoint by calling `OGDLog.ConfigureMirroring()` with the given endpoint url as a string.
164+
You can mirror your OpenGameData events to a secondary endpoint by calling `OGDLog.ConfigureMirroring()` with the given endpoint url as a string. You can optionally pass in an app id to use as an override for the endpoint.
165165

166166
## Debugging
167167

0 commit comments

Comments
 (0)