ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-15 21:24:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #1022 from KazWolfe/kami-log-fixes

Browse source
This commit is contained in:
goat 2022-10-16 18:56:34 +02:00 • committed by GitHub
commit 1c5383a335
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Dalamud/Interface/Internal/Windows/ConsoleWindow.cs
View file

@ -40,6 +40,7 @@ namespace Dalamud.Interface.Internal.Windows
private string textFilter = string.Empty; private string textFilter = string.Empty;
private int levelFilter; private int levelFilter;
private List<string> sourceFilters = new(); private List<string> sourceFilters = new();
private bool filterShowUncaughtExceptions = false;
private bool isFiltered = false; private bool isFiltered = false;
private int historyPos; private int historyPos;
@ -179,7 +180,9 @@ namespace Dalamud.Interface.Internal.Windows
} }
// Filter by specific plugin(s) // Filter by specific plugin(s)
var pluginInternalNames = Service<PluginManager>.Get().InstalledPlugins.Select(p => p.Manifest.InternalName).ToList(); var pluginInternalNames = Service<PluginManager>.Get().InstalledPlugins
.Select(p => p.Manifest.InternalName)
.OrderBy(s => s).ToList();
var sourcePreviewVal = this.sourceFilters.Count switch var sourcePreviewVal = this.sourceFilters.Count switch
{ {
0 => "All plugins...", 0 => "All plugins...",
@ -209,6 +212,11 @@ namespace Dalamud.Interface.Internal.Windows
ImGui.EndCombo(); ImGui.EndCombo();
} }
if (ImGui.Checkbox("Always Show Uncaught Exceptions", ref this.filterShowUncaughtExceptions))
{
this.Refilter();
}
ImGui.EndPopup(); ImGui.EndPopup();
} }
@ -488,6 +496,7 @@ namespace Dalamud.Interface.Internal.Windows
Level = logEvent.Level, Level = logEvent.Level,
Line = line, Line = line,
TimeStamp = logEvent.Timestamp, TimeStamp = logEvent.Timestamp,
HasException = logEvent.Exception != null,
}; };
if (logEvent.Properties.TryGetValue("SourceContext", out var sourceProp) && if (logEvent.Properties.TryGetValue("SourceContext", out var sourceProp) &&
@ -510,6 +519,11 @@ namespace Dalamud.Interface.Internal.Windows
if (this.levelFilter > 0 && ((this.levelFilter >> (int)entry.Level) & 1) == 0) if (this.levelFilter > 0 && ((this.levelFilter >> (int)entry.Level) & 1) == 0)
return false; return false;
// Show exceptions that weren't properly tagged with a Source (generally meaning they were uncaught)
// After log levels because uncaught exceptions should *never* fall below Error.
if (this.filterShowUncaughtExceptions && entry.HasException && entry.Source == null)
return true;
if (this.sourceFilters.Count > 0 && !this.sourceFilters.Contains(entry.Source)) if (this.sourceFilters.Count > 0 && !this.sourceFilters.Contains(entry.Source))
return false; return false;
@ -565,6 +579,8 @@ namespace Dalamud.Interface.Internal.Windows
public bool IsMultiline { get; set; } public bool IsMultiline { get; set; }
public string? Source { get; set; } public string? Source { get; set; }
public bool HasException { get; set; }
} }
} }
} }