t0w0bi/ClubPenguinClient
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Loggerrework (#45)

Browse Source 
* test some refactoring for cachedplayer

* rework logging

* fix saving of log level

---------

Co-authored-by: rootdarkarchon <root.darkarchon@outlook.com>
This commit is contained in:
rootdarkarchon
2023-02-18 15:23:38 +01:00
committed by GitHub
parent 7f36e80e2a
commit 2ae5d42e4d
49 changed files with 676 additions and 691 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
MareSynchronos/UI/CompactUI.cs
View File

@@ -16,8 +16,8 @@ using MareSynchronos.Mediator;
using MareSynchronos.Models;
using MareSynchronos.UI.Components;
using MareSynchronos.UI.Handlers;
using MareSynchronos.Utils;
using MareSynchronos.WebAPI;
using Microsoft.Extensions.Logging;
namespace MareSynchronos.UI;
@@ -55,9 +55,9 @@ public class CompactUi : WindowMediatorSubscriberBase, IDisposable
private readonly SelectPairForGroupUi _selectPairsForGroupUi;
private readonly PairGroupsUi _pairGroupsUi;
public CompactUi(WindowSystem windowSystem,
public CompactUi(ILogger<CompactUi> logger, WindowSystem windowSystem,
UiShared uiShared, MareConfigService configService, ApiController apiController, PairManager pairManager,
ServerConfigurationManager serverManager, MareMediator mediator) : base(mediator, "###MareSynchronosMainUI")
ServerConfigurationManager serverManager, MareMediator mediator) : base(logger, mediator, "###MareSynchronosMainUI")
{
#if DEBUG
@@ -69,7 +69,7 @@ public class CompactUi : WindowMediatorSubscriberBase, IDisposable
var ver = Assembly.GetExecutingAssembly().GetName().Version;
this.WindowName = "Mare Synchronos " + ver.Major + "." + ver.Minor + "." + ver.Build + "###MareSynchronosMainUI";
#endif
Logger.Verbose("Creating " + nameof(CompactUi));
_logger.LogTrace("Creating " + nameof(CompactUi));
_windowSystem = windowSystem;
_uiShared = uiShared;

10
MareSynchronos/UI/DownloadUi.cs
View File

@@ -2,13 +2,14 @@
using Dalamud.Interface.Windowing;
using ImGuiNET;
using MareSynchronos.MareConfiguration;
using MareSynchronos.Utils;
using MareSynchronos.WebAPI;
using Microsoft.Extensions.Logging;
namespace MareSynchronos.UI;
public class DownloadUi : Window, IDisposable
{
private readonly ILogger<DownloadUi> _logger;
private readonly WindowSystem _windowSystem;
private readonly MareConfigService _configService;
private readonly ApiController _apiController;
@@ -17,13 +18,14 @@ public class DownloadUi : Window, IDisposable
public void Dispose()
{
Logger.Verbose($"Disposing {GetType()}");
_logger.LogTrace($"Disposing {GetType()}");
_windowSystem.RemoveWindow(this);
}
public DownloadUi(WindowSystem windowSystem, MareConfigService configService, ApiController apiController, UiShared uiShared) : base("Mare Synchronos Downloads")
public DownloadUi(ILogger<DownloadUi> logger, WindowSystem windowSystem, MareConfigService configService, ApiController apiController, UiShared uiShared) : base("Mare Synchronos Downloads")
{
Logger.Verbose("Creating " + nameof(DownloadUi));
_logger = logger;
_logger.LogTrace("Creating " + nameof(DownloadUi));
_windowSystem = windowSystem;
_configService = configService;
_apiController = apiController;

5
MareSynchronos/UI/GposeUi.cs
View File

@@ -7,6 +7,7 @@ using MareSynchronos.Export;
using MareSynchronos.MareConfiguration;
using MareSynchronos.Mediator;
using MareSynchronos.Utils;
using Microsoft.Extensions.Logging;
namespace MareSynchronos.UI;
@@ -18,9 +19,9 @@ public class GposeUi : WindowMediatorSubscriberBase, IDisposable
private readonly FileDialogManager _fileDialogManager;
private readonly MareConfigService _configService;
public GposeUi(WindowSystem windowSystem, MareCharaFileManager mareCharaFileManager,
public GposeUi(ILogger<GposeUi> logger, WindowSystem windowSystem, MareCharaFileManager mareCharaFileManager,
DalamudUtil dalamudUtil, FileDialogManager fileDialogManager, MareConfigService configService,
MareMediator mediator) : base(mediator, "Mare Synchronos Gpose Import UI###MareSynchronosGposeUI")
MareMediator mediator) : base(logger, mediator, "Mare Synchronos Gpose Import UI###MareSynchronosGposeUI")
{
_windowSystem = windowSystem;
_mareCharaFileManager = mareCharaFileManager;

1
MareSynchronos/UI/Handlers/TagHandler.cs
View File

@@ -1,6 +1,5 @@
using MareSynchronos.API.Dto.User;
using MareSynchronos.Managers;
using MareSynchronos.Models;
namespace MareSynchronos.UI.Handlers
{

8
MareSynchronos/UI/IntroUI.cs
View File

@@ -2,7 +2,6 @@
using Dalamud.Interface.Colors;
using Dalamud.Interface.Windowing;
using ImGuiNET;
using MareSynchronos.Utils;
using MareSynchronos.Localization;
using Dalamud.Utility;
using MareSynchronos.FileCache;
@@ -11,6 +10,7 @@ using MareSynchronos.Managers;
using MareSynchronos.MareConfiguration;
using MareSynchronos.Mediator;
using MareSynchronos.MareConfiguration.Models;
using Microsoft.Extensions.Logging;
namespace MareSynchronos.UI;
@@ -37,10 +37,10 @@ internal class IntroUi : WindowMediatorSubscriberBase, IDisposable
_windowSystem.RemoveWindow(this);
}
public IntroUi(WindowSystem windowSystem, UiShared uiShared, MareConfigService configService,
PeriodicFileScanner fileCacheManager, ServerConfigurationManager serverConfigurationManager, MareMediator mareMediator) : base(mareMediator, "Mare Synchronos Setup")
public IntroUi(ILogger<IntroUi> logger, WindowSystem windowSystem, UiShared uiShared, MareConfigService configService,
PeriodicFileScanner fileCacheManager, ServerConfigurationManager serverConfigurationManager, MareMediator mareMediator) : base(logger, mareMediator, "Mare Synchronos Setup")
{
Logger.Verbose("Creating " + nameof(IntroUi));
_logger.LogTrace("Creating " + nameof(IntroUi));
_uiShared = uiShared;
_configService = configService;

16
MareSynchronos/UI/SettingsUi.cs
View File

@@ -4,7 +4,6 @@ using Dalamud.Interface.Windowing;
using ImGuiNET;
using MareSynchronos.WebAPI;
using System.Numerics;
using MareSynchronos.Utils;
using MareSynchronos.WebAPI.Utils;
using Dalamud.Utility;
using Newtonsoft.Json;
@@ -15,6 +14,7 @@ using MareSynchronos.API.Data.Comparer;
using MareSynchronos.MareConfiguration;
using MareSynchronos.Mediator;
using MareSynchronos.MareConfiguration.Models;
using Microsoft.Extensions.Logging;
namespace MareSynchronos.UI;
@@ -34,12 +34,12 @@ public class SettingsUi : WindowMediatorSubscriberBase, IDisposable
private string _lastTab = string.Empty;
private bool _wasOpen = false;
public SettingsUi(WindowSystem windowSystem,
public SettingsUi(ILogger<SettingsUi> logger, WindowSystem windowSystem,
UiShared uiShared, MareConfigService configService,
MareCharaFileManager mareCharaFileManager, PairManager pairManager,
ServerConfigurationManager serverConfigurationManager, MareMediator mediator) : base(mediator, "Mare Synchronos Settings")
ServerConfigurationManager serverConfigurationManager, MareMediator mediator) : base(logger, mediator, "Mare Synchronos Settings")
{
Logger.Verbose("Creating " + nameof(SettingsUi));
_logger.LogTrace("Creating " + nameof(SettingsUi));
SizeConstraints = new WindowSizeConstraints()
{
@@ -564,6 +564,12 @@ public class SettingsUi : WindowMediatorSubscriberBase, IDisposable
}
}
UiShared.AttachToolTip("Use this when reporting mods being rejected from the server.");
_uiShared.DrawCombo<LogLevel>("Log Level", Enum.GetValues<LogLevel>(), (l) => l.ToString(), (l) =>
{
_configService.Current.LogLevel = l;
_configService.Save();
}, _configService.Current.LogLevel);
}
private void DrawBlockedTransfers()
@@ -719,7 +725,7 @@ public class SettingsUi : WindowMediatorSubscriberBase, IDisposable
}
catch (Exception ex)
{
Logger.Error("Error saving data", ex);
_logger.LogCritical("Error saving data", ex);
}
});
});

13
MareSynchronos/UI/UIShared.cs
View File

@@ -18,6 +18,7 @@ using MareSynchronos.Mediator;
using MareSynchronos.Models;
using MareSynchronos.Utils;
using MareSynchronos.WebAPI;
using Microsoft.Extensions.Logging;
namespace MareSynchronos.UI;
@@ -60,9 +61,9 @@ public partial class UiShared : MediatorSubscriberBase
private bool _heelsExists = false;
private bool _palettePlusExists = false;
public UiShared(IpcManager ipcManager, ApiController apiController, PeriodicFileScanner cacheScanner, FileDialogManager fileDialogManager,
public UiShared(ILogger<UiShared> logger, IpcManager ipcManager, ApiController apiController, PeriodicFileScanner cacheScanner, FileDialogManager fileDialogManager,
MareConfigService configService, DalamudUtil dalamudUtil, DalamudPluginInterface pluginInterface, Dalamud.Localization localization,
ServerConfigurationManager serverManager, MareMediator mediator) : base(mediator)
ServerConfigurationManager serverManager, MareMediator mediator) : base(logger, mediator)
{
_ipcManager = ipcManager;
_apiController = apiController;
@@ -154,13 +155,13 @@ public partial class UiShared : MediatorSubscriberBase
}
catch (Exception ex)
{
Logger.Warn($"Font failed to load. {fontFile}");
Logger.Warn(ex.ToString());
_logger.LogWarning($"Font failed to load. {fontFile}");
_logger.LogWarning(ex.ToString());
}
}
else
{
Logger.Debug($"Font doesn't exist. {fontFile}");
_logger.LogDebug($"Font doesn't exist. {fontFile}");
}
}
@@ -693,7 +694,7 @@ public partial class UiShared : MediatorSubscriberBase
}
catch
{
Logger.Warn("Could not parse " + note);
_logger.LogWarning("Could not parse " + note);
}
}