onedev/k8s-helper

Use ansi colors in log when appropriate
Robin Shen committed 3 years ago

4b8b0679

1 parent 8721463e
Release

Revision indexing in progress... (symbol navigation in revisions will be accurate after indexed)

Total 4 files Show one by one

■ ■ ■ ■ ■ ■

src/main/java/io/onedev/k8shelper/Init.java

		skipped 21 lines
22	22		logger.info(KubernetesHelper.LOG_END_MESSAGE);
23	23		System.exit(0);
24	24		} catch (Exception e) {
25		-	logger.error("Error executing init logic", e);
	25	+	logger.error(KubernetesHelper.wrapWithAnsiBoldRed("Error executing init logic"), e);
26	26		logger.info(KubernetesHelper.LOG_END_MESSAGE);
27	27		System.exit(1);
28	28		}
		skipped 4 lines

■ ■ ■ ■ ■ ■

src/main/java/io/onedev/k8shelper/KubernetesHelper.java

1	1		package io.onedev.k8shelper;
2	2
	3	+	import static java.nio.charset.StandardCharsets.UTF_8;
	4	+
3	5		import java.io.File;
4	6		import java.io.FileFilter;
5	7		import java.io.IOException;
		skipped 1 lines
7	9		import java.io.OutputStream;
8	10		import java.nio.ByteBuffer;
9	11		import java.nio.charset.Charset;
10		-	import static java.nio.charset.StandardCharsets.UTF_8;
11	12		import java.nio.file.Files;
12	13		import java.util.ArrayList;
13	14		import java.util.Base64;
		skipped 171 lines
185	186		"@echo off",
186	187		":wait",
187	188		"if exist \"" + markPrefix + ".skip\" (",
188		-	" echo Skipping step ^\"" + escapedStepNames + "^\"...",
	189	+	" echo \u001b[1;35mSkipping step ^\"" + escapedStepNames + "^\"...\u001b[0m",
189	190		" echo " + LOG_END_MESSAGE,
190	191		" goto :eof",
191	192		")",
192	193		"if exist \"" + markPrefix + ".error\" (",
193		-	" echo Running step ^\"" + escapedStepNames + "^\"...",
	194	+	" echo \u001b[1;35mRunning step ^\"" + escapedStepNames + "^\"...\u001b[0m",
194	195		" type " + markPrefix + ".error",
195	196		" copy /y nul " + markPrefix + ".failed > nul",
196	197		" echo " + LOG_END_MESSAGE,
		skipped 5 lines
202	203		":start",
203	204		"cd " + getWorkspace().getAbsolutePath()
204	205		+ " && cmd /c " + setupScriptFile.getAbsolutePath()
205		-	+ " && cmd /c echo Running step ^\"" + escapedStepNames + "^\"..."
	206	+	+ " && cmd /c echo \u001b[1;35mRunning step ^\"" + escapedStepNames + "^\"...\u001b[0m"
206	207		+ " && cmd /c " + stepScriptFile.getAbsolutePath(),
207	208		"set exit_code=%errorlevel%",
208	209		"if \"%exit_code%\"==\"0\" (",
		skipped 22 lines
231	232		"done",
232	233		"if [ -f " + markPrefix + ".skip ]",
233	234		"then",
234		-	" echo 'Skipping step \"" + escapedStepNames + "\"...'",
	235	+	" echo '\\033[1;35mSkipping step \"" + escapedStepNames + "\"...\\033[0m'",
235	236		" echo " + LOG_END_MESSAGE,
236	237		" exit 0",
237	238		"fi",
238	239		"if [ -f " + markPrefix + ".error ]",
239	240		"then",
240		-	" echo 'Running step \"" + escapedStepNames + "\"...'",
	241	+	" echo '\\033[1;35mRunning step \"" + escapedStepNames + "\"...\\033[0m'",
241	242		" cat " + markPrefix + ".error",
242	243		" touch " + markPrefix + ".failed",
243	244		" echo " + LOG_END_MESSAGE,
		skipped 1 lines
245	246		"fi",
246	247		"cd " + getWorkspace().getAbsolutePath()
247	248		+ " && sh " + setupScriptFile.getAbsolutePath()
248		-	+ " && echo 'Running step \"" + escapedStepNames + "\"...'"
	249	+	+ " && echo '\\033[1;35mRunning step \"" + escapedStepNames + "\"...\\033[0m'"
249	250		+ " && sh " + stepScriptFile.getAbsolutePath(),
250	251		"exitCode=\"$?\"",
251	252		"if [ $exitCode -eq 0 ]",
		skipped 26 lines
278	279		@Override
279	280		public void consume(String line) {
280	281		if (!line.contains("Warning: use -cacerts option to access cacerts keystore"))
281		-	logger.error(line);
	282	+	logger.error(wrapWithAnsiBoldRed(line));
282	283		}
283	284
284	285		}).checkReturnCode();
		skipped 18 lines
303	304
304	305		@Override
305	306		public void consume(String line) {
306		-	logger.error(line);
	307	+	logger.error(wrapWithAnsiBoldRed(line));
307	308		}
308	309
309	310		};
		skipped 642 lines
952	953		for (String each: collection)
953	954		replacedCollection.add(replacePlaceholders(each, buildHome));
954	955		return replacedCollection;
	956	+	}
	957	+
	958	+	public static String wrapWithAnsiBoldRed(String text) {
	959	+	return "\033[1;31m" + text + "\033[0m";
	960	+	}
	961	+
	962	+	public static String wrapWithAnsiBoldYellow(String text) {
	963	+	return "\033[1;33m" + text + "\033[0m";
	964	+	}
	965	+
	966	+	public static String wrapWithAnsiBold(String text) {
	967	+	return "\033[1;35m" + text + "\033[0m";
955	968		}
956	969
957	970		}
		skipped 1 lines

■ ■ ■ ■ ■ ■

src/main/java/io/onedev/k8shelper/RunServerStep.java

		skipped 20 lines
21	21
22	22		KubernetesHelper.runServerStep(serverUrl, jobToken, args[0], args[1], args[2], args[3]);
23	23		} catch (Exception e) {
24		-	logger.error("Error executing step", e);
	24	+	logger.error(KubernetesHelper.wrapWithAnsiBoldRed("Error executing step"), e);
25	25		exitCode = 1;
26	26		} finally {
27	27		logger.info(KubernetesHelper.LOG_END_MESSAGE);
		skipped 6 lines

■ ■ ■ ■ ■ ■

src/main/java/io/onedev/k8shelper/SideCar.java

		skipped 22 lines
23	23		logger.info(KubernetesHelper.LOG_END_MESSAGE);
24	24		System.exit(0);
25	25		} catch (Exception e) {
26		-	logger.error("Error executing sidecar logic", e);
	26	+	logger.error(KubernetesHelper.wrapWithAnsiBoldRed("Error executing sidecar logic"), e);
27	27		logger.info(KubernetesHelper.LOG_END_MESSAGE);
28	28		System.exit(1);
29	29		}
		skipped 4 lines

Use ansi colors in log when appropriate