fix: Fixes structured logging (#1043)

- [X] Fixes various bugs in logging.
This commit is contained in:
Kamron Batman 2022-06-05 01:00:22 -07:00 • committed by GitHub
parent 78bb4f4bb2
commit 6e69d25e33
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
31 changed files with 96 additions and 102 deletions

View file

@ -31,7 +31,7 @@ public static class AccountPrompt
AccessLevel = AccessLevel.Owner
};
logger.Information("Owner account created: {0}", username);
logger.Information("Owner account created: {Username}", username);
ServerAccess.AddProtectedAccount(a, true);
}
else

View file

@ -138,7 +138,7 @@ namespace Server.Misc
if (newChar == null)
{
logger.Information("Login: {0}: Character creation failed, account full", state);
logger.Information("Login: {NetState}: Character creation failed, account full", state);
return;
}

View file

@ -122,14 +122,14 @@ namespace Server.Misc
if (boxes > 0)
{
logger.Information(
"Cleanup: Detected {0} inaccessible items, including {1} bank boxes, removing..",
"Cleanup: Detected {Count} inaccessible items, including {BankBoxes} bank boxes, removing..",
items.Count,
boxes
);
}
else
{
logger.Information("Cleanup: Detected {0} inaccessible items, removing..", items.Count);
logger.Information("Cleanup: Detected {Count} inaccessible items, removing..", items.Count);
}
for (var i = 0; i < items.Count; ++i)

View file

@ -25,7 +25,7 @@ public static class ServerAccess
{
var username = acct.Username.ToLower();
ServerAccessConfiguration.ProtectedAccounts.Add(username);
logger.Information("Protected account added: {0}", username);
logger.Information("Protected account added: {Username}", username);
if (save)
{
@ -37,7 +37,7 @@ public static class ServerAccess
{
var username = acct.Username.ToLower();
ServerAccessConfiguration.ProtectedAccounts.Remove(username);
logger.Information("Protected account removed: {0}", username);
logger.Information("Protected account removed: {Username}", username);
if (save)
{
@ -59,7 +59,7 @@ public static class ServerAccess
if (ServerAccessConfiguration.ProtectedAccounts.Count > 0)
{
var protectedAccounts = string.Join(", ", ServerAccessConfiguration.ProtectedAccounts);
logger.Information("Protected accounts registered: {0}", protectedAccounts);
logger.Information("Protected accounts registered: {Count}", protectedAccounts);
}
}
@ -85,7 +85,7 @@ public static class ServerAccess
acct.Banned = false;
acct.AccessLevel = AccessLevel.Owner;
logger.Warning("Protected account \"{0}\" has been reset.", username);
logger.Warning("Protected account \"{Username}\" has been reset.", username);
if (e.RejectReason is ALRReason.Blocked or ALRReason.BadPass or ALRReason.BadComm)
{

View file

@ -104,7 +104,7 @@ namespace Server.Misc
if (_publicAddress != null)
{
logger.Information("Auto-detected public IP address ({0})", _publicAddress);
logger.Information("Auto-detected public IP address ({IPAddress})", _publicAddress);
}
else
{