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

This commit is contained in:
Stanley Dimant
2024-07-19 10:19:18 +02:00
committed by Loporrit
parent 626df3f861
commit d9d10c42de
2 changed files with 11 additions and 3 deletions

View File

@@ -37,7 +37,7 @@ public class PlayerDataFactory
{ {
if (!_ipcManager.Initialized) if (!_ipcManager.Initialized)
{ {
throw new InvalidOperationException("Penumbra is not connected"); throw new InvalidOperationException("Penumbra or Glamourer is not connected");
} }
if (playerRelatedObject == null) return; if (playerRelatedObject == null) return;

View File

@@ -81,17 +81,25 @@ public class ServerConfigurationManager
var auth = currentServer.Authentications.FindAll(f => string.Equals(f.CharacterName, charaName, StringComparison.Ordinal) && f.WorldId == worldId); var auth = currentServer.Authentications.FindAll(f => string.Equals(f.CharacterName, charaName, StringComparison.Ordinal) && f.WorldId == worldId);
if (auth.Count >= 2) 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)); 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; return null;
} }
if (auth.Count == 0) return null;
if (currentServer.SecretKeys.TryGetValue(auth.Single().SecretKeyIdx, out var secretKey)) 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; 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; return null;
} }