Skip to content
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public class StackTraceReader implements LogAnalyserModule {
StringBuilder build = new StringBuilder();


@Override
@Override
public void analyse(String log, Message message) {


Expand All @@ -67,7 +67,7 @@ public void analyse(String log, Message message) {
List<String> jar_names = new ArrayList<String>();
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<String, Boolean> jar : jars.entrySet()) {
String[] lvl_info_arr = jar.getKey().split(Pattern.quote(" **lvl ** "));
Expand All @@ -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<String, Boolean> modid : modids.entrySet()) {
if (modid.getValue()) {
Expand All @@ -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<String, Boolean> pack : packs.entrySet()) {
if (pack.getValue()) {
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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);

}
Expand All @@ -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);
}
Expand Down Expand Up @@ -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);
}
}
Expand All @@ -372,7 +386,6 @@ private void extractJarNamesSquareBracket(String line, boolean fatal,int lvl, in
endIdx = line.indexOf(']', endIdx + 1);
}
}

public static List<String> getTraces(String log) {
List<String> stackTraces = new ArrayList<>();
Matcher matcher = STACK_TRACE_PATTERN.matcher(log);
Expand Down