space-wizards/RobustToolbox
1
0
Fork 0
mirror of https://github.com/space-wizards/RobustToolbox.git synced 2026-02-15 03:30:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade Loki sink to 4.0.0-beta3.

Browse Source 
This fixes many bugs with it.
This commit is contained in:
Pieter-Jan Briers
2021-11-15 13:42:19 +01:00
parent 8d84c56a72
commit 5a6a16e7dc
3 changed files with 33 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Robust.Server/BaseServer.cs
View File

@@ -424,12 +424,12 @@ namespace Robust.Server
return false;
}
LokiCredentials credentials;
if (string.IsNullOrWhiteSpace(username))
LokiSinkConfiguration cfg = new()
{
credentials = new NoAuthCredentials(address);
}
else
LokiUrl = address
};
if (!string.IsNullOrWhiteSpace(username))
{
if (string.IsNullOrWhiteSpace(password))
{
@@ -437,13 +437,16 @@ namespace Robust.Server
return false;
}
credentials = new BasicAuthCredentials(address, username, password);
cfg.LokiUsername = username;
cfg.LokiPassword = password;
}
cfg.LogLabelProvider = new LogLabelProvider(serverName);
Logger.DebugS("loki", "Loki enabled for server {ServerName} loki address {LokiAddress}.", serverName,
address);
var handler = new LokiLogHandler(serverName, credentials);
var handler = new LokiLogHandler(cfg);
_log.RootSawmill.AddHandler(handler);
return true;
}