Improved logging (#678)
Build and Release / Read metadata (push) Waiting to run
Build and Release / Build app (${{ matrix.dotnet_runtime }}) (-aarch64-apple-darwin, osx-arm64, macos-latest, aarch64-apple-darwin, dmg updater) (push) Blocked by required conditions
Build and Release / Build app (${{ matrix.dotnet_runtime }}) (-aarch64-pc-windows-msvc.exe, win-arm64, windows-latest, aarch64-pc-windows-msvc, nsis updater) (push) Blocked by required conditions
Build and Release / Build app (${{ matrix.dotnet_runtime }}) (-aarch64-unknown-linux-gnu, linux-arm64, ubuntu-22.04-arm, aarch64-unknown-linux-gnu, appimage deb updater) (push) Blocked by required conditions
Build and Release / Build app (${{ matrix.dotnet_runtime }}) (-x86_64-apple-darwin, osx-x64, macos-latest, x86_64-apple-darwin, dmg updater) (push) Blocked by required conditions
Build and Release / Build app (${{ matrix.dotnet_runtime }}) (-x86_64-pc-windows-msvc.exe, win-x64, windows-latest, x86_64-pc-windows-msvc, nsis updater) (push) Blocked by required conditions
Build and Release / Build app (${{ matrix.dotnet_runtime }}) (-x86_64-unknown-linux-gnu, linux-x64, ubuntu-22.04, x86_64-unknown-linux-gnu, appimage deb updater) (push) Blocked by required conditions
Build and Release / Prepare & create release (push) Blocked by required conditions
Build and Release / Publish release (push) Blocked by required conditions

This commit is contained in:
Thorsten Sommer authored and GitHub committed 2026-02-25 19:30:46 +01:00
1 parent 09df19e6f5
commit 685f95245b
7 files changed
+169 -39

No files matched your search

@@ -100,7 +100,7 @@ public sealed class RustAvailabilityMonitorService : BackgroundService, IMessage
{
try
{
await this.rustService.ReadUserLanguage();
await this.rustService.ReadUserLanguage(forceRequest: true);
}
catch (Exception e)
{
@@ -2,15 +2,34 @@
public sealed partial class RustService
{
public async Task<string> ReadUserLanguage()
public async Task<string> ReadUserLanguage(bool forceRequest = false)
{
var response = await this.http.GetAsync("/system/language");
if (!response.IsSuccessStatusCode)
if (!forceRequest && !string.IsNullOrWhiteSpace(this.cachedUserLanguage))
return this.cachedUserLanguage;
await this.userLanguageLock.WaitAsync();
try
{
this.logger!.LogError($"Failed to read the user language from Rust: '{response.StatusCode}'");
return string.Empty;
if (!forceRequest && !string.IsNullOrWhiteSpace(this.cachedUserLanguage))
return this.cachedUserLanguage;
var response = await this.http.GetAsync("/system/language");
if (!response.IsSuccessStatusCode)
{
this.logger!.LogError($"Failed to read the user language from Rust: '{response.StatusCode}'");
return string.Empty;
}
var userLanguage = (await response.Content.ReadAsStringAsync()).Trim();
if (string.IsNullOrWhiteSpace(userLanguage))
return string.Empty;
this.cachedUserLanguage = userLanguage;
return userLanguage;
}
finally
{
this.userLanguageLock.Release();
}
return await response.Content.ReadAsStringAsync();
}
}
@@ -17,6 +17,7 @@ public sealed partial class RustService : BackgroundService
private static string TB(string fallbackEN) => I18N.I.T(fallbackEN, typeof(RustService).Namespace, nameof(RustService));
private readonly HttpClient http;
private readonly SemaphoreSlim userLanguageLock = new(1, 1);
private readonly JsonSerializerOptions jsonRustSerializerOptions = new()
{
@@ -29,6 +30,7 @@ public sealed partial class RustService : BackgroundService
private ILogger<RustService>? logger;
private Encryption? encryptor;
private string? cachedUserLanguage;
private readonly string apiPort;
private readonly string certificateFingerprint;
@@ -88,6 +90,7 @@ public sealed partial class RustService : BackgroundService
public override void Dispose()
{
this.http.Dispose();
this.userLanguageLock.Dispose();
base.Dispose();
}
+23 -10
View File
@@ -13,6 +13,12 @@ public sealed class TerminalLogger() : ConsoleFormatter(FORMATTER_NAME)
public const string FORMATTER_NAME = "AI Studio Terminal Logger";
private static RustService? RUST_SERVICE;
// ReSharper disable FieldCanBeMadeReadOnly.Local
// ReSharper disable ConvertToConstant.Local
private static bool LOG_TO_STDOUT = true;
// ReSharper restore ConvertToConstant.Local
// ReSharper restore FieldCanBeMadeReadOnly.Local
// Buffer for early log events before the RustService is available:
private static readonly ConcurrentQueue<LogEventRequest> EARLY_LOG_BUFFER = new();
@@ -44,6 +50,10 @@ public sealed class TerminalLogger() : ConsoleFormatter(FORMATTER_NAME)
bufferedEvent.StackTrace
);
}
#if !DEBUG
LOG_TO_STDOUT = false;
#endif
}
public override void Write<TState>(in LogEntry<TState> logEntry, IExternalScopeProvider? scopeProvider, TextWriter textWriter)
@@ -56,19 +66,22 @@ public sealed class TerminalLogger() : ConsoleFormatter(FORMATTER_NAME)
var stackTrace = logEntry.Exception?.StackTrace;
var colorCode = GetColorForLogLevel(logEntry.LogLevel);
textWriter.Write($"[{colorCode}{timestamp}{ANSI_RESET}] {colorCode}{logLevel}{ANSI_RESET} [{category}] {colorCode}{message}{ANSI_RESET}");
if (logEntry.Exception is not null)
if (LOG_TO_STDOUT)
{
textWriter.Write($" {colorCode}Exception: {exceptionMessage}{ANSI_RESET}");
if (stackTrace is not null)
textWriter.Write($"[{colorCode}{timestamp}{ANSI_RESET}] {colorCode}{logLevel}{ANSI_RESET} [{category}] {colorCode}{message}{ANSI_RESET}");
if (logEntry.Exception is not null)
{
textWriter.WriteLine();
foreach (var line in stackTrace.Split('\n'))
textWriter.WriteLine($" {colorCode}{line.TrimEnd()}{ANSI_RESET}");
textWriter.Write($" {colorCode}Exception: {exceptionMessage}{ANSI_RESET}");
if (stackTrace is not null)
{
textWriter.WriteLine();
foreach (var line in stackTrace.Split('\n'))
textWriter.WriteLine($" {colorCode}{line.TrimEnd()}{ANSI_RESET}");
}
}
else
textWriter.WriteLine();
}
else
textWriter.WriteLine();
// Send log event to Rust via API (fire-and-forget):
if (RUST_SERVICE is not null)
@@ -90,4 +103,4 @@ public sealed class TerminalLogger() : ConsoleFormatter(FORMATTER_NAME)
_ => ANSI_RESET
};
}
}
@@ -1 +1,5 @@
# v26.3.1, build 235 (2026-03-xx xx:xx UTC)
- Improved the performance by caching the OS language detection and requesting the user language only once per app start.
- Improved the user-language logging by limiting language detection logs to a single entry per app start.
- Improved the logbook readability by removing non-readable special characters from log entries.
- Improved the logbook reliability by significantly reducing duplicate log entries.