log auth server

Simple-Station · Jan 19, 2025 · 266064c · 266064c
1 parent 85f06af
commit 266064c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/SS14.Launcher/Models/Connector.cs b/SS14.Launcher/Models/Connector.cs
@@ -330,11 +330,11 @@ private async Task LaunchClientWrap(
             cVars.Add(("ROBUST_AUTH_TOKEN", account.LoginInfo.Token.Token));
             cVars.Add(("ROBUST_AUTH_USERID", account.LoginInfo.UserId.ToString()));
             cVars.Add(("ROBUST_AUTH_PUBKEY", info.AuthInformation.PublicKey));
-            // cVars.Add(("ROBUST_AUTH_SERVER", ConfigConstants.AuthUrl));
-            cVars.Add(("ROBUST_AUTH_SERVER",
-                ConfigConstants
-                    .AuthUrls[info.AuthInformation.LoginUrls?.FirstOrDefault() ?? ConfigConstants.FallbackAuthServer]
-                    .AuthUrl.ToString()));
+            var authServer = ConfigConstants
+                .AuthUrls[info.AuthInformation.LoginUrls?.FirstOrDefault() ?? ConfigConstants.FallbackAuthServer]
+                .AuthUrl.ToString();
+            cVars.Add(("ROBUST_AUTH_SERVER", authServer));
+            Log.Information($"Launching client with auth server {authServer} and account {account.Username}@{account.Server} ({account.UserId})");
         }
 
         try
@@ -685,7 +685,7 @@ private static async Task<ProcessStartInfo> GetLoaderStartInfo()
         string basePath;
 
 #if FULL_RELEASE
-            const bool release = true;
+        const bool release = true;
 #else
         const bool release = false;
 #endif
@@ -706,7 +706,7 @@ private static async Task<ProcessStartInfo> GetLoaderStartInfo()
         {
             return new ProcessStartInfo
             {
-                FileName = Path.Combine(basePath, "SS14.Loader")
+                FileName = Path.Combine(basePath, "SS14.Loader"),
             };
         }
 

diff --git a/SS14.Launcher/Models/EngineManager/EngineManagerDynamic.cs b/SS14.Launcher/Models/EngineManager/EngineManagerDynamic.cs
@@ -87,7 +87,8 @@ public async Task<EngineInstallationResult> DownloadEngineIfNecessary(
         if (foundVersion.Info.Insecure)
             throw new UpdateException("Specified engine version is insecure!");
 
-        Log.Debug($"Requested engine version was {version}, redirected to {foundVersion.Version}");
+        if (version != foundVersion.Version)
+            Log.Debug($"Requested engine version was {version}, redirected to {foundVersion.Version}");
 
         if (_cfg.EngineInstallations.Lookup(foundVersion.Version).HasValue)
         {