Skip to content

Commit 5a511a2

Browse files
Revert some unneeded changes to Logger done in 679e0de
Logger was updated to get suppressed exceptions by calling `Throwable[] getSuppressed()` but `printStackTrace()` would already log them, even though shortened stacktrace with `... n more` notation, but this should be enough for debugging since main throwable stacktrace should have enough class line info. Manually logging full suppressed stacktraces would likely trigger `LOGGER_ENTRY_MAX_PAYLOAD` and split the message into multiple log entries and also duplicate the suppressed stacktraces, so best revert this unless ever necessary.
1 parent 5c50964 commit 5a511a2

File tree

1 file changed

+13
-74
lines changed
  • termux-shared/src/main/java/com/termux/shared/logger

1 file changed

+13
-74
lines changed

termux-shared/src/main/java/com/termux/shared/logger/Logger.java

Lines changed: 13 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -219,105 +219,54 @@ public static void logDebugAndShowToast(Context context, String message) {
219219

220220

221221

222-
public static void logStackTraceWithMessage(String tag, String message, Throwable throwable, boolean getSuppressed) {
223-
Logger.logErrorExtended(tag, getMessageAndStackTraceString(message, throwable, getSuppressed));
224-
}
225-
226222
public static void logStackTraceWithMessage(String tag, String message, Throwable throwable) {
227-
logStackTraceWithMessage(tag, message, throwable, true);
228-
}
229-
230-
public static void logStackTraceWithMessage(String message, Throwable throwable, boolean getSuppressed) {
231-
logStackTraceWithMessage(DEFAULT_LOG_TAG, message, throwable, getSuppressed);
223+
Logger.logErrorExtended(tag, getMessageAndStackTraceString(message, throwable));
232224
}
233225

234226
public static void logStackTraceWithMessage(String message, Throwable throwable) {
235-
logStackTraceWithMessage(DEFAULT_LOG_TAG, message, throwable, true);
236-
}
237-
238-
239-
public static void logStackTrace(String tag, Throwable throwable, boolean getSuppressed) {
240-
logStackTraceWithMessage(tag, null, throwable, getSuppressed);
227+
logStackTraceWithMessage(DEFAULT_LOG_TAG, message, throwable);
241228
}
242229

243230
public static void logStackTrace(String tag, Throwable throwable) {
244-
logStackTraceWithMessage(tag, null, throwable, true);
245-
}
246-
247-
248-
public static void logStackTrace(Throwable throwable, boolean getSuppressed) {
249-
logStackTraceWithMessage(DEFAULT_LOG_TAG, null, throwable, getSuppressed);
231+
logStackTraceWithMessage(tag, null, throwable);
250232
}
251233

252234
public static void logStackTrace(Throwable throwable) {
253-
logStackTraceWithMessage(DEFAULT_LOG_TAG, null, throwable, true);
235+
logStackTraceWithMessage(DEFAULT_LOG_TAG, null, throwable);
254236
}
255237

256238

257239

258-
public static void logStackTracesWithMessage(String tag, String message, List<Throwable> throwablesList, boolean getSuppressed) {
259-
Logger.logErrorExtended(tag, getMessageAndStackTracesString(message, throwablesList, getSuppressed));
260-
}
261-
262240
public static void logStackTracesWithMessage(String tag, String message, List<Throwable> throwablesList) {
263-
Logger.logErrorExtended(tag, getMessageAndStackTracesString(message, throwablesList, true));
241+
Logger.logErrorExtended(tag, getMessageAndStackTracesString(message, throwablesList));
264242
}
265243

266244

267245

268246
public static String getMessageAndStackTraceString(String message, Throwable throwable) {
269-
return getMessageAndStackTraceString(message, throwable, true);
270-
}
271-
272-
public static String getMessageAndStackTraceString(String message, Throwable throwable, boolean getSuppressed) {
273247
if (message == null && throwable == null)
274248
return null;
275249
else if (message != null && throwable != null)
276-
return message + ":\n" + getStackTraceString(throwable, getSuppressed);
250+
return message + ":\n" + getStackTraceString(throwable);
277251
else if (throwable == null)
278252
return message;
279253
else
280-
return getStackTraceString(throwable, getSuppressed);
254+
return getStackTraceString(throwable);
281255
}
282256

283-
284-
285257
public static String getMessageAndStackTracesString(String message, List<Throwable> throwablesList) {
286-
return getMessageAndStackTracesString(message, throwablesList, true);
287-
}
288-
289-
public static String getMessageAndStackTracesString(String message, List<Throwable> throwablesList, boolean getSuppressed) {
290258
if (message == null && (throwablesList == null || throwablesList.size() == 0))
291259
return null;
292260
else if (message != null && (throwablesList != null && throwablesList.size() != 0))
293-
return message + ":\n" + getStackTracesString(null, getStackTracesStringArray(throwablesList, getSuppressed));
261+
return message + ":\n" + getStackTracesString(null, getStackTracesStringArray(throwablesList));
294262
else if (throwablesList == null || throwablesList.size() == 0)
295263
return message;
296264
else
297-
return getStackTracesString(null, getStackTracesStringArray(throwablesList, getSuppressed));
265+
return getStackTracesString(null, getStackTracesStringArray(throwablesList));
298266
}
299267

300268

301269

302-
public static String getStackTraceString(Throwable throwable, boolean getSuppressed) {
303-
if (throwable == null) return null;
304-
305-
StringBuilder stackTraceString = new StringBuilder();
306-
stackTraceString.append(getStackTraceString(throwable));
307-
308-
if (getSuppressed) {
309-
Throwable[] suppressedThrowablesArray = throwable.getSuppressed();
310-
if (suppressedThrowablesArray != null && suppressedThrowablesArray.length > 0) {
311-
for (Throwable suppressedThrowable : suppressedThrowablesArray) {
312-
if (suppressedThrowable == null) continue;
313-
stackTraceString.append("\n\n").append(getStackTraceString(suppressedThrowable));
314-
}
315-
}
316-
}
317-
318-
return stackTraceString.toString();
319-
}
320-
321270
public static String getStackTraceString(Throwable throwable) {
322271
if (throwable == null) return null;
323272

@@ -339,25 +288,15 @@ public static String getStackTraceString(Throwable throwable) {
339288

340289

341290

342-
public static String[] getStackTracesStringArray(Throwable throwable, boolean getSuppressed) {
343-
return getStackTracesStringArray(Collections.singletonList(throwable), getSuppressed);
344-
}
345-
346291
public static String[] getStackTracesStringArray(Throwable throwable) {
347-
return getStackTracesStringArray(Collections.singletonList(throwable), true);
292+
return getStackTracesStringArray(Collections.singletonList(throwable));
348293
}
349294

350295
public static String[] getStackTracesStringArray(List<Throwable> throwablesList) {
351-
return getStackTracesStringArray(throwablesList, true);
352-
353-
}
354-
355-
public static String[] getStackTracesStringArray(List<Throwable> throwablesList, boolean getSuppressed) {
356296
if (throwablesList == null) return null;
357-
358297
final String[] stackTraceStringArray = new String[throwablesList.size()];
359298
for (int i = 0; i < throwablesList.size(); i++) {
360-
stackTraceStringArray[i] = getStackTraceString(throwablesList.get(i), getSuppressed);
299+
stackTraceStringArray[i] = getStackTraceString(throwablesList.get(i));
361300
}
362301
return stackTraceStringArray;
363302
}
@@ -415,7 +354,7 @@ public static String getMultiLineLogStringEntry(String label, Object object, Str
415354
else
416355
return label + ": " + def;
417356
}
418-
357+
419358

420359

421360
public static void showToast(final Context context, final String toastText, boolean longDuration) {
@@ -444,7 +383,7 @@ public static CharSequence[] getLogLevelLabelsArray(Context context, CharSequenc
444383
logLevelLabels[i] = getLogLevelLabel(context, Integer.parseInt(logLevels[i].toString()), addDefaultTag);
445384
}
446385

447-
return logLevelLabels;
386+
return logLevelLabels;
448387
}
449388

450389
public static String getLogLevelLabel(final Context context, final int logLevel, final boolean addDefaultTag) {

0 commit comments

Comments
 (0)