From 6b56fa42da9c0db580392f62fb7a3084c3595411 Mon Sep 17 00:00:00 2001 From: Asbestosstar Date: Thu, 20 Mar 2025 02:30:47 -0600 Subject: [PATCH] Replace ln with decimal specify it should be lower --- .../logs/modules/StackTraceReader.java | 29 ++++++++++++++----- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/mangorage/mangobot/modules/logs/modules/StackTraceReader.java b/src/main/java/org/mangorage/mangobot/modules/logs/modules/StackTraceReader.java index e1a9d68..fcc80ad 100644 --- a/src/main/java/org/mangorage/mangobot/modules/logs/modules/StackTraceReader.java +++ b/src/main/java/org/mangorage/mangobot/modules/logs/modules/StackTraceReader.java @@ -48,7 +48,7 @@ public class StackTraceReader implements LogAnalyserModule { StringBuilder build = new StringBuilder(); - @Override + @Override public void analyse(String log, Message message) { @@ -67,7 +67,7 @@ public void analyse(String log, Message message) { List jar_names = new ArrayList(); if (!jars.isEmpty()) { build.append( - "**Found potentially problematic JAR files (Prioritise FATAL then Higher lvl then lower ln):**") + "**Found potentially problematic JAR files (Prioritise FATAL then Lower lvl):**") .append(nl); for (Map.Entry jar : jars.entrySet()) { String[] lvl_info_arr = jar.getKey().split(Pattern.quote(" **lvl ** ")); @@ -92,7 +92,7 @@ public void analyse(String log, Message message) { if (!modids.isEmpty()) { build.append( - "**Found potentially problematic modids (Prioritise FATAL then Higher lvl then lower ln):**") + "**Found potentially problematic modids (Prioritise FATAL then Lower lvl):**") .append(nl); for (Map.Entry modid : modids.entrySet()) { if (modid.getValue()) { @@ -104,7 +104,7 @@ public void analyse(String log, Message message) { if (!packs.isEmpty()) { build.append( - "**Found potentially problematic packages (Prioritise FATAL then Higher lvl then lower ln):**") + "**Found potentially problematic packages (Prioritise FATAL then Lower lvl):**") .append(nl); for (Map.Entry pack : packs.entrySet()) { if (pack.getValue()) { @@ -153,6 +153,20 @@ public void analyse(String log, Message message) { ; } + + + + sm_config.clear(); + jars.clear(); + modids.clear(); + packs.clear(); + braceContents.clear(); + fatal_missing_classes.clear(); + bad_jar.clear(); + bad_modid.clear(); + bad_package.clear(); + build = new StringBuilder(); + } public void processTrace(String trace, boolean fatal, int lvl) { @@ -186,7 +200,7 @@ public void processTrace(String trace, boolean fatal, int lvl) { if (!bad_modid.contains(modid) && !line.split("/")[0].startsWith("java.")&&!isModIDDenylisted(modid)&&line.startsWith("at")) { bad_modid.add(modid); modids.put( - modid + " **lvl ** " + String.valueOf(lvl) + "** ln** " + String.valueOf(line_num), + modid + " **lvl ** " + String.valueOf(lvl) + "." + String.valueOf(line_num), fatal); } @@ -199,7 +213,7 @@ public void processTrace(String trace, boolean fatal, int lvl) { } String pack = line.substring(3, line_len); if(!bad_package.contains(pack) && !packIsDenyListed(pack)) { - packs.put(pack + " **lvl ** " + Integer.toString(lvl) + "** ln** " + Integer.toString(line_num), + packs.put(pack + " **lvl ** " + Integer.toString(lvl) + "." + Integer.toString(line_num), fatal); bad_package.add(pack); } @@ -363,7 +377,7 @@ private void extractJarNamesSquareBracket(String line, boolean fatal,int lvl, in if (candidate.contains(".jar") && !isJarDenied(candidate)) { if (!bad_jar.contains(candidate)) { bad_jar.add(candidate); - jars.put(candidate + " **lvl ** " + Integer.toString(lvl) + "** ln** " + Integer.toString(line_num), + jars.put(candidate + " **lvl ** " + Integer.toString(lvl) + "**.**" + Integer.toString(line_num), fatal); } } @@ -372,7 +386,6 @@ private void extractJarNamesSquareBracket(String line, boolean fatal,int lvl, in endIdx = line.indexOf(']', endIdx + 1); } } - public static List getTraces(String log) { List stackTraces = new ArrayList<>(); Matcher matcher = STACK_TRACE_PATTERN.matcher(log);