Windcorp/JavaProgressia
Windcorp/JavaProgressia
Archived
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Refactored CrashReportGenerator to avoid deadlocks and clarify code

Browse Source
This commit is contained in:
OLEGSHA 2020-11-10 01:25:42 +03:00
parent d5723b9ae6
commit 0017ecc5a7
1 changed files with 58 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/main/java/ru/windcorp/progressia/common/util/crash/CrashReportGenerator.java
View File

@ -57,15 +57,21 @@ public class CrashReportGenerator {
} }
private static void appendContextProviders(StringBuilder output) { private static void appendContextProviders(StringBuilder output) {
for (ContextProvider provider : PROVIDERS) {
if (provider != null) { // Do a local copy to avoid deadlocks -OLEGSHA
Map<String, String> buf = new HashMap<>(); ContextProvider[] localProvidersCopy =
PROVIDERS.toArray(new ContextProvider[PROVIDERS.size()]);
for (ContextProvider provider : localProvidersCopy) {
if (provider == null) continue;
addSeparator(output);
try { try {
Map<String, String> buf = new HashMap<>();
provider.provideContext(buf); provider.provideContext(buf);
if (!buf.isEmpty()) { if (!buf.isEmpty()) {
addSeparator(output);
output.append("Provider name: ").append(provider.getName()).append("\n"); output.append("Provider name: ").append(provider.getName()).append("\n");
for (Map.Entry<String, String> entry : buf.entrySet()) { for (Map.Entry<String, String> entry : buf.entrySet()) {
output.append(entry.getKey()).append(": ").append(entry.getValue()).append("\n"); output.append(entry.getKey()).append(": ").append(entry.getValue()).append("\n");
@ -73,14 +79,17 @@ public class CrashReportGenerator {
} }
} catch (Throwable t) { } catch (Throwable t) {
output.append("\n"); output.append("\n");
String providerName;
try { try {
output.append(provider.getName()).append(" is broken").append("\n"); providerName = provider.getName();
} catch (Throwable th) { } catch (Throwable t1) {
output.append(provider.getClass().getName()).append(" is broken").append("\n"); providerName = provider.getClass().getName();
// You stupid
}
// Analyzer is broken
} }
output.append(providerName).append(" is broken").append("\n");
// ContextProvider is broken
} }
} }
} }
@ -90,8 +99,13 @@ public class CrashReportGenerator {
Throwable throwable, String messageFormat, Object[] args Throwable throwable, String messageFormat, Object[] args
) { ) {
boolean analyzerResponsesExist = false; boolean analyzerResponsesExist = false;
for (Analyzer analyzer : ANALYZERS) {
if (analyzer != null) { // Do a local copy to avoid deadlocks -OLEGSHA
Analyzer[] localAnalyzersCopy =
ANALYZERS.toArray(new Analyzer[ANALYZERS.size()]);
for (Analyzer analyzer : localAnalyzersCopy) {
if (analyzer == null) continue;
String answer; String answer;
try { try {
@ -102,22 +116,28 @@ public class CrashReportGenerator {
output.append(analyzer.getName()).append(": ").append(answer).append("\n"); output.append(analyzer.getName()).append(": ").append(answer).append("\n");
} }
} catch (Throwable t) { } catch (Throwable t) {
try {
analyzerResponsesExist = true; analyzerResponsesExist = true;
output.append(analyzer.getName()).append(" is broken").append("\n");
} catch (Throwable th) { output.append("\n");
// You stupid
String analyzerName;
try {
analyzerName = analyzer.getName();
} catch (Throwable t1) {
analyzerName = analyzer.getClass().getName();
} }
output.append(analyzerName).append(" is broken").append("\n");
// Analyzer is broken // Analyzer is broken
} }
} }
}
return analyzerResponsesExist; return analyzerResponsesExist;
} }
private static void appendMessageFormat(StringBuilder output, String messageFormat, Object... arg) { private static void appendMessageFormat(StringBuilder output, String messageFormat, Object... arg) {
output.append("Provided description: ").append(String.format(messageFormat, arg)).append("\n"); output.append("Provided description: \n").append(String.format(messageFormat, arg)).append("\n");
addSeparator(output); addSeparator(output);
} }