friendlynamazu/client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

remove notification spam, add more trace logging for secret key access

Browse Source
This commit is contained in:
Stanley Dimant
2024-07-19 10:19:18 +02:00
parent e1f480b44a
commit 0c47bf8ccd
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
MareSynchronos/PlayerData/Factories/PlayerDataFactory.cs
View File

@@ -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");
}

12
MareSynchronos/Services/ServerConfiguration/ServerConfigurationManager.cs
View File

@@ -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;
}