onedev/commons

Improved task logger
Robin Shen committed 3 years ago

0b41ce28

1 parent d2c48a36
Release

Total 1 files

■ ■ ■ ■ ■ ■

commons-utils/src/main/java/io/onedev/commons/utils/TaskLogger.java

		skipped 10 lines
11	11
12	12		private static final Pattern EOL_PATTERN = Pattern.compile("\r?\n");
13	13
14		-	public void log(String message, Throwable t) {
15		-	StringBuilder builder = new StringBuilder(message);
	14	+	public void log(@Nullable String message, Throwable t) {
	15	+	log(toString(message, t));
	16	+	}
	17	+
	18	+	private String toString(@Nullable String message, Throwable t) {
	19	+	StringBuilder builder = new StringBuilder();
	20	+	if (message != null)
	21	+	builder.append(message).append(": ");
	22	+	boolean firstLine = true;
16	23		for (String line: Splitter.on(EOL_PATTERN).split(Throwables.getStackTraceAsString(t))) {
17		-	if (builder.length() == 0)
	24	+	if (firstLine)
18	25		builder.append(line);
19	26		else
20	27		builder.append("\n ").append(line);
	28	+	firstLine = false;
21	29		}
22		-	log(builder.toString());
	30	+	return builder.toString();
23	31		}
24	32
25	33		public abstract void log(String message, @Nullable String sessionId);
		skipped 3 lines
29	37		}
30	38
31	39		public void error(String message, Throwable t) {
32		-	log(wrapWithAnsiError(message), t);
	40	+	log(wrapWithAnsiError(toString(message, t)));
33	41		}
34	42
35	43		public void error(String message) {
36	44		log(wrapWithAnsiError(message));
37	45		}
38	46
39		-	public void warning(String message, Throwable t) {
40		-	log(wrapWithAnsiWarning(message), t);
41		-	}
42		-
43	47		public void warning(String message) {
44	48		log(wrapWithAnsiWarning(message));
45	49		}
46	50
47		-	public void emphasize(String message, Throwable t) {
48		-	log(wrapWithAnsiEmphasize(message), t);
	51	+	public void notice(String message) {
	52	+	log(wrapWithAnsiNotice(message));
49	53		}
50	54
51		-	public void emphasize(String message) {
52		-	log(wrapWithAnsiEmphasize(message));
	55	+	public void success(String message) {
	56	+	log(wrapWithAnsiSuccess(message));
	57	+	}
	58	+
	59	+	public static String wrapWithAnsiSuccess(String text) {
	60	+	return "\033[1;32m" + text + "\033[0m";
53	61		}
54	62
55	63		public static String wrapWithAnsiError(String text) {
		skipped 4 lines
60	68		return "\033[1;33m" + text + "\033[0m";
61	69		}
62	70
63		-	public static String wrapWithAnsiEmphasize(String text) {
	71	+	public static String wrapWithAnsiNotice(String text) {
64	72		return "\033[1;35m" + text + "\033[0m";
65	73		}
66	74
		skipped 2 lines

Improved task logger