Skip to content

Edgecloud 6227 gRPC #209

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ah1053 merged 2 commits into from
Mar 30, 2022
Merged

Edgecloud 6227 gRPC #209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c79b0f
Remove MEL references
ah1053 Mar 11, 2022
6e7f8bd
Update C# binary to 3.0.14, update HealthCheck enums
ah1053 Mar 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions Runtime/Plugins/Android.meta
View file
Open in desktop

This file was deleted.

27 changes: 0 additions & 27 deletions Runtime/Plugins/Android/AndroidManifest.xml.DISABLED
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions Runtime/Plugins/Android/AndroidManifest.xml.DISABLED.meta
View file
Open in desktop

This file was deleted.

Binary file removed Runtime/Plugins/Android/mel.aar
View file
Open in desktop
Binary file not shown.
32 changes: 0 additions & 32 deletions Runtime/Plugins/Android/mel.aar.meta
View file
Open in desktop

This file was deleted.

Binary file modified Runtime/Plugins/MobiledgeX.MatchingEngineGrpc.dll
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions Runtime/Scripts/EdgeEventsManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -482,8 +482,8 @@ private void HandleReceivedEvents(ServerEdgeEvent edgeEvent)
{
errorMsg = $"Received EventAppinstHealth Event but NewCloudlet is null, {edgeEvent.ErrorMsg}";
PropagateError(AppInstHealthChanged, EventTriggeredButFindCloudletError, errorMsg);
if (edgeEvent.HealthCheck == HealthCheck.FailRootlbOffline
|| edgeEvent.HealthCheck == HealthCheck.FailServerFail
if (edgeEvent.HealthCheck == HealthCheck.RootlbOffline
|| edgeEvent.HealthCheck == HealthCheck.ServerFail
|| edgeEvent.HealthCheck == HealthCheck.CloudletOffline
|| edgeEvent.HealthCheck == HealthCheck.Unknown)
{
Expand Down
130 changes: 0 additions & 130 deletions Runtime/Scripts/MelMessaging.cs
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions Runtime/Scripts/MelMessaging.cs.meta
View file
Open in desktop

This file was deleted.

15 changes: 1 addition & 14 deletions Runtime/Scripts/MobiledgeXIntegration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright 2018-2021 MobiledgeX, Inc. All rights and licenses reserved.
* Copyright 2018-2022 MobiledgeX, Inc. All rights and licenses reserved.
* MobiledgeX, Inc. 156 2nd Street #408, San Francisco, CA 94105
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand Down Expand Up @@ -81,7 +81,6 @@ public partial class MobiledgeXIntegration : IDisposable
AppPort latestAppPort = null;
AppPort[] latestAppPortList = null;
Location fallbackLocation = new Location(0, 0);
MelMessaging melMessaging;

/// <summary>
/// EdgeEvents Manager is responsible for Sending and Receiving EdgeEvents according to EdgeEvents Config
Expand Down Expand Up @@ -142,12 +141,6 @@ public MobiledgeXIntegration(EdgeEventsManager edgeEventsManager = null, Carrier
uniqueId == null ? pIntegration.UniqueID : uniqueId,
deviceInfo == null ? pIntegration.DeviceInfo : deviceInfo);

if (settings.MEL_ENABLED)
{
melMessaging = new MelMessaging(appName);
matchingEngine.SetMelMessaging(melMessaging);
}

this.edgeEventsManager = edgeEventsManager;
#if UNITY_EDITOR
matchingEngine.EnableEdgeEvents = false;
Expand All @@ -169,12 +162,6 @@ public MobiledgeXIntegration(string orgName, string appName, string appVers, str

matchingEngine = new MatchingEngine(pIntegration.CarrierInfo, pIntegration.NetInterface, pIntegration.UniqueID, pIntegration.DeviceInfo);

if (settings.MEL_ENABLED)
{
melMessaging = new MelMessaging(appName);
matchingEngine.SetMelMessaging(melMessaging);
}

this.edgeEventsManager = edgeEventsManager;
#if UNITY_EDITOR
matchingEngine.EnableEdgeEvents = false;
Expand Down
4 changes: 1 addition & 3 deletions Runtime/Scripts/MobiledgeXSettings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright 2018-2021 MobiledgeX, Inc. All rights and licenses reserved.
* Copyright 2018-2022 MobiledgeX, Inc. All rights and licenses reserved.
* MobiledgeX, Inc. 156 2nd Street #408, San Francisco, CA 94105
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand Down Expand Up @@ -31,8 +31,6 @@ public class MobiledgeXSettings : ScriptableObject
public string region;
public Logger.LogType logType = Logger.LogType.ErrorsAndWarnings;
public EdgeEventsConfig edgeEventsConfig;
[Tooltip("Set to true, If MEL mode is Enabled on your device.")]
public bool MEL_ENABLED;

private void OnEnable()
{
Expand Down