From a4548a72c15740c56d762804288dd426841d3489 Mon Sep 17 00:00:00 2001 From: Derek S <44935661+Derek-R-S@users.noreply.github.com> Date: Fri, 9 Apr 2021 21:58:12 -0500 Subject: [PATCH] Added better support for environment variables --- .../LRM/Program/Program.cs | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/ServerProject-DONT-IMPORT-INTO-UNITY/LRM/Program/Program.cs b/ServerProject-DONT-IMPORT-INTO-UNITY/LRM/Program/Program.cs index b4582fc..9c53ced 100644 --- a/ServerProject-DONT-IMPORT-INTO-UNITY/LRM/Program/Program.cs +++ b/ServerProject-DONT-IMPORT-INTO-UNITY/LRM/Program/Program.cs @@ -47,15 +47,21 @@ namespace LightReflectiveMirror conf = JsonConvert.DeserializeObject(File.ReadAllText(CONFIG_PATH)); // Docker variables. - try + if (ushort.TryParse(Environment.GetEnvironmentVariable("LRM_ENDPOINT_PORT"), out ushort endpointPort)) + conf.EndpointPort = endpointPort; + + if (ushort.TryParse(Environment.GetEnvironmentVariable("LRM_TRANSPORT_PORT"), out ushort transportPort)) + conf.TransportPort = transportPort; + + if (ushort.TryParse(Environment.GetEnvironmentVariable("LRM_PUNCHER_PORT"), out ushort puncherPort)) + conf.NATPunchtroughPort = puncherPort; + + string LBAuthKey = Environment.GetEnvironmentVariable("LRM_LB_AUTHKEY"); + if (!string.IsNullOrWhiteSpace(LBAuthKey)) { - conf.EndpointPort = ushort.Parse(Environment.GetEnvironmentVariable("LRM_ENDPOINT_PORT")); - - conf.TransportPort = ushort.Parse(Environment.GetEnvironmentVariable("LRM_TRANSPORT_PORT")); - - conf.NATPunchtroughPort = ushort.Parse(Environment.GetEnvironmentVariable("LRM_PUNCHER_PORT")); + conf.LoadBalancerAuthKey = LBAuthKey; + WriteLogMessage("\nLoaded LB auth key from environment variable\n", ConsoleColor.Green); } - catch { } WriteLogMessage("Loading Assembly... ", ConsoleColor.White, true); try