From b17101f1c837dae66d289e691b0f180521b90a47 Mon Sep 17 00:00:00 2001 From: Loporrit <141286461+loporrit@users.noreply.github.com> Date: Sat, 10 Feb 2024 13:56:16 +0000 Subject: [PATCH] Update service URI --- .../ServerConfiguration/ServerConfigurationManager.cs | 9 +++++++-- MareSynchronos/WebAPI/SignalR/ApiController.cs | 3 ++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/MareSynchronos/Services/ServerConfiguration/ServerConfigurationManager.cs b/MareSynchronos/Services/ServerConfiguration/ServerConfigurationManager.cs index a1ddf02..76cce58 100644 --- a/MareSynchronos/Services/ServerConfiguration/ServerConfigurationManager.cs +++ b/MareSynchronos/Services/ServerConfiguration/ServerConfigurationManager.cs @@ -343,6 +343,11 @@ public class ServerConfigurationManager for (int i = 0; i < _configService.Current.ServerStorage.Count; ++i) { var x = _configService.Current.ServerStorage[i]; + if (x.ServerUri.Equals(ApiController.LoporritServiceUriOld, StringComparison.OrdinalIgnoreCase)) + { + _logger.LogDebug("Updating server URI {old} => {new}", x.ServerUri, ApiController.LoporritServiceUri); + x.ServerUri = _configService.Current.ServerStorage[i].ServerUri = ApiController.LoporritServiceUri; + } if (x.ServerUri.Equals(ApiController.LoporritServiceUri, StringComparison.OrdinalIgnoreCase)) lopExists = true; if (x.ServerUri.Equals(ApiController.MainServiceUri, StringComparison.OrdinalIgnoreCase)) @@ -350,14 +355,14 @@ public class ServerConfigurationManager } if (mainIdx >= 0) { - _logger.LogDebug("Removing main server {ApiController.MainServiceUri}"); + _logger.LogDebug("Removing main server {uri}", ApiController.MainServiceUri); _configService.Current.ServerStorage.RemoveAt(mainIdx); if (_configService.Current.CurrentServer >= mainIdx) _configService.Current.CurrentServer--; } if (!lopExists) { - _logger.LogDebug("Re-adding missing server {ApiController.LoporritServiceUri}"); + _logger.LogDebug("Re-adding missing server {uri}", ApiController.LoporritServiceUri); _configService.Current.ServerStorage.Insert(0, new ServerStorage() { ServerUri = ApiController.LoporritServiceUri, ServerName = ApiController.LoporritServer }); if (_configService.Current.CurrentServer >= 0) _configService.Current.CurrentServer++; diff --git a/MareSynchronos/WebAPI/SignalR/ApiController.cs b/MareSynchronos/WebAPI/SignalR/ApiController.cs index 3503c45..e1be8e4 100644 --- a/MareSynchronos/WebAPI/SignalR/ApiController.cs +++ b/MareSynchronos/WebAPI/SignalR/ApiController.cs @@ -20,7 +20,8 @@ namespace MareSynchronos.WebAPI; public sealed partial class ApiController : DisposableMediatorSubscriberBase, IMareHubClient { public const string LoporritServer = "Loporrit Main Server"; - public const string LoporritServiceUri = "wss://loporrit.us.to"; + public const string LoporritServiceUri = "wss://lop-sync.com"; + public const string LoporritServiceUriOld = "wss://loporrit.us.to"; public const string MainServer = "Lunae Crescere Incipientis (Central Server EU)"; public const string MainServiceUri = "wss://maresynchronos.com";