From 0c47bf8ccd7f09ab0d0f9630814307a230679343 Mon Sep 17 00:00:00 2001 From: Stanley Dimant Date: Fri, 19 Jul 2024 10:19:18 +0200 Subject: [PATCH] remove notification spam, add more trace logging for secret key access --- .../PlayerData/Factories/PlayerDataFactory.cs | 3 --- .../ServerConfigurationManager.cs | 12 ++++++++++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/MareSynchronos/PlayerData/Factories/PlayerDataFactory.cs b/MareSynchronos/PlayerData/Factories/PlayerDataFactory.cs index 094f687..eadf9b4 100644 --- a/MareSynchronos/PlayerData/Factories/PlayerDataFactory.cs +++ b/MareSynchronos/PlayerData/Factories/PlayerDataFactory.cs @@ -43,9 +43,6 @@ public class PlayerDataFactory { if (!_ipcManager.Initialized) { - _mareMediator.Publish(new NotificationMessage("Penumbra/Glamourer inactive", - "Mare attempted to process building your character data, but Penumbra or Glamourer are inactive. Enable and set up Penumbra and Glamourer for Mare to be able to function.", - NotificationType.Error)); throw new InvalidOperationException("Penumbra or Glamourer is not connected"); } diff --git a/MareSynchronos/Services/ServerConfiguration/ServerConfigurationManager.cs b/MareSynchronos/Services/ServerConfiguration/ServerConfigurationManager.cs index b68bb25..4b52eee 100644 --- a/MareSynchronos/Services/ServerConfiguration/ServerConfigurationManager.cs +++ b/MareSynchronos/Services/ServerConfiguration/ServerConfigurationManager.cs @@ -103,17 +103,25 @@ public class ServerConfigurationManager var auth = currentServer.Authentications.FindAll(f => string.Equals(f.CharacterName, charaName, StringComparison.Ordinal) && f.WorldId == worldId); if (auth.Count >= 2) { - _mareMediator.Publish(new NotificationMessage("Multiple Identical Characters detected", "Your Service configuration has multiple characters with the same name and world set up. Please delete the duplicates.", + _mareMediator.Publish(new NotificationMessage("Multiple Identical Characters detected", "Your Service configuration has multiple characters with the same name and world set up. Please delete the duplicates in the character configuration.", NotificationType.Error)); + _logger.LogTrace("GetSecretKey accessed, returning null because multiple ({count}) identical characters.", auth.Count); + return null; + } + if (auth.Count == 0) + { + _logger.LogTrace("GetSecretKey accessed, returning null because no set up characters for {chara} on {world}", charaName, worldId); return null; } - if (auth.Count == 0) return null; if (currentServer.SecretKeys.TryGetValue(auth.Single().SecretKeyIdx, out var secretKey)) { + _logger.LogTrace("GetSecretKey accessed, returning {key} ({keyValue}) for {chara} on {world}", secretKey.FriendlyName, string.Join("", secretKey.Key.Take(10)), charaName, worldId); return secretKey.Key; } + _logger.LogTrace("GetSecretKey accessed, returning null because no fitting key found for {chara} on {world} for idx {idx}.", charaName, worldId, auth.Single().SecretKeyIdx); + return null; }