From 9df89adac8a954e9055e6ae05fc971e64558c579 Mon Sep 17 00:00:00 2001 From: Stanley Dimant Date: Tue, 4 Oct 2022 14:14:56 +0200 Subject: [PATCH] adjust some of the logging --- MareSynchronos/Factories/CharacterDataFactory.cs | 2 +- MareSynchronos/FileCache/FileDbManager.cs | 4 ++-- MareSynchronos/FileCache/PeriodicFileScanner.cs | 4 ++-- MareSynchronos/Managers/TransientResourceManager.cs | 2 +- MareSynchronos/UI/CompactUI.cs | 2 +- MareSynchronos/WebAPI/ApiController.cs | 1 + 6 files changed, 8 insertions(+), 7 deletions(-) diff --git a/MareSynchronos/Factories/CharacterDataFactory.cs b/MareSynchronos/Factories/CharacterDataFactory.cs index efab6a1..f2cadd0 100644 --- a/MareSynchronos/Factories/CharacterDataFactory.cs +++ b/MareSynchronos/Factories/CharacterDataFactory.cs @@ -328,7 +328,7 @@ public class CharacterDataFactory var gamePath = item.GamePaths.First().ToLowerInvariant(); if (string.Equals(penumResolve, gamePath, StringComparison.Ordinal)) { - Logger.Debug("PenumResolve was same as GamePath, not adding " + item); + Logger.Verbose("PenumResolve was same as GamePath, not adding " + item); transientResourceManager.RemoveTransientResource(charaPointer, item); } else diff --git a/MareSynchronos/FileCache/FileDbManager.cs b/MareSynchronos/FileCache/FileDbManager.cs index b110675..e2dee5c 100644 --- a/MareSynchronos/FileCache/FileDbManager.cs +++ b/MareSynchronos/FileCache/FileDbManager.cs @@ -133,7 +133,7 @@ public class FileCacheManager : IDisposable public FileCacheEntity? CreateCacheEntry(string path) { - Logger.Debug("Creating cache entry for " + path); + Logger.Verbose("Creating cache entry for " + path); FileInfo fi = new(path); if (!fi.Exists) return null; var fullName = fi.FullName.ToLowerInvariant(); @@ -144,7 +144,7 @@ public class FileCacheManager : IDisposable public FileCacheEntity? CreateFileEntry(string path) { - Logger.Debug("Creating file entry for " + path); + Logger.Verbose("Creating file entry for " + path); FileInfo fi = new(path); if (!fi.Exists) return null; var fullName = fi.FullName.ToLowerInvariant(); diff --git a/MareSynchronos/FileCache/PeriodicFileScanner.cs b/MareSynchronos/FileCache/PeriodicFileScanner.cs index 37a42d9..df737dc 100644 --- a/MareSynchronos/FileCache/PeriodicFileScanner.cs +++ b/MareSynchronos/FileCache/PeriodicFileScanner.cs @@ -283,7 +283,7 @@ public class PeriodicFileScanner : IDisposable _fileDbManager.WriteOutFullCsv(); } - Logger.Debug("Scanner validated existing db files"); + Logger.Verbose("Scanner validated existing db files"); if (ct.IsCancellationRequested) return; @@ -314,7 +314,7 @@ public class PeriodicFileScanner : IDisposable Task.WaitAll(dbTasks); - Logger.Debug("Scanner added new files to db"); + Logger.Verbose("Scanner added new files to db"); Logger.Debug("Scan complete"); TotalFiles = 0; diff --git a/MareSynchronos/Managers/TransientResourceManager.cs b/MareSynchronos/Managers/TransientResourceManager.cs index 97d02be..d82c61a 100644 --- a/MareSynchronos/Managers/TransientResourceManager.cs +++ b/MareSynchronos/Managers/TransientResourceManager.cs @@ -109,7 +109,7 @@ public class TransientResourceManager : IDisposable SemiTransientResources.Any(r => r.Value.Any(f => string.Equals(f.GamePaths.First(), replacedGamePath , StringComparison.OrdinalIgnoreCase) && string.Equals(f.ResolvedPath, filePath, StringComparison.OrdinalIgnoreCase)))) { - Logger.Debug("Not adding " + replacedGamePath + ":" + filePath); + Logger.Verbose("Not adding " + replacedGamePath + ":" + filePath); Logger.Verbose("SemiTransientAny: " + SemiTransientResources.Any(r => r.Value.Any(f => string.Equals(f.GamePaths.First(), replacedGamePath, StringComparison.OrdinalIgnoreCase) && string.Equals(f.ResolvedPath, filePath, StringComparison.OrdinalIgnoreCase))).ToString() + ", TransientAny: " + TransientResources[gameObject].Contains(replacedGamePath)); } diff --git a/MareSynchronos/UI/CompactUI.cs b/MareSynchronos/UI/CompactUI.cs index f58ad2c..d0162c1 100644 --- a/MareSynchronos/UI/CompactUI.cs +++ b/MareSynchronos/UI/CompactUI.cs @@ -159,7 +159,7 @@ public class CompactUi : Window, IDisposable { var buttonSize = UiShared.GetIconButtonSize(FontAwesomeIcon.Plus); ImGui.SetNextItemWidth(UiShared.GetWindowContentRegionWidth() - ImGui.GetWindowContentRegionMin().X - buttonSize.X); - ImGui.InputTextWithHint("##otheruid", "Other players UID/GID", ref _pairToAdd, 10); + ImGui.InputTextWithHint("##otheruid", "Other players UID/Alias", ref _pairToAdd, 20); ImGui.SameLine(ImGui.GetWindowContentRegionMin().X + UiShared.GetWindowContentRegionWidth() - buttonSize.X); if (ImGuiComponents.IconButton(FontAwesomeIcon.Plus)) { diff --git a/MareSynchronos/WebAPI/ApiController.cs b/MareSynchronos/WebAPI/ApiController.cs index 14c3bfc..a84923f 100644 --- a/MareSynchronos/WebAPI/ApiController.cs +++ b/MareSynchronos/WebAPI/ApiController.cs @@ -355,6 +355,7 @@ public partial class ApiController : IDisposable private Task MareHubOnReconnecting(Exception? arg) { + _connectionDto = null; _healthCheckTokenSource?.Cancel(); ServerState = ServerState.Disconnected; Logger.Warn("Connection closed... Reconnecting");