Stops StartWait at log.Fatal

Author: Florian

pkg/util/log/loading_text.go

@@ -14,10 +14,11 @@ type loadingText struct {
 	Stream  io.Writer
 	Message string
 
-	startTimestamp int64
-	loadingRune    int
-	isShown        bool
-	stopChan       chan bool
+	startTimestamp    int64
+	loadingRune       int
+	isShown           bool
+	stopChan          chan bool
+	stopConfirmedChan chan bool
 }
 
 func (l *loadingText) Start() {
@@ -27,13 +28,17 @@ func (l *loadingText) Start() {
 	if l.stopChan == nil {
 		l.stopChan = make(chan bool)
 	}
+	if l.stopConfirmedChan == nil {
+		l.stopConfirmedChan = make(chan bool)
+	}
 
 	go func() {
 		l.render()
 
 		for {
 			select {
 			case <-l.stopChan:
+				l.stopConfirmedChan <- true
 				return
 			case <-time.After(waitInterval):
 				l.render()
@@ -82,6 +87,7 @@ func (l *loadingText) render() {
 
 func (l *loadingText) Stop() {
 	l.stopChan <- true
+	<-l.stopConfirmedChan
 	l.Stream.Write([]byte("\r"))
 
 	messageLength := len(l.Message) + 20

pkg/util/log/stdout_logger.go

@@ -91,7 +91,7 @@ func (s *stdoutLogger) writeMessage(fnType logFunctionType, message string) {
 
 		fnInformation.stream.Write([]byte(message))
 
-		if s.loadingText != nil {
+		if s.loadingText != nil && fnType != fatalFn {
 			s.loadingText.Start()
 		}
 	}
@@ -244,7 +244,19 @@ func (s *stdoutLogger) Fatal(args ...interface{}) {
 	s.logMutex.Lock()
 	defer s.logMutex.Unlock()
 
-	s.writeMessage(fatalFn, fmt.Sprintln(args...))
+	if s.loadingText != nil {
+		s.loadingText.Stop()
+		s.loadingText = nil
+	}
+
+	fnInformation := fnTypeInformationMap[fatalFn]
+
+	ct.Foreground(fnInformation.color, false)
+	fnInformation.stream.Write([]byte(fnInformation.tag))
+
+	ct.ResetColor()
+	fnInformation.stream.Write([]byte(fmt.Sprintln(args...)))
+
 	s.writeMessageToFileLogger(fatalFn, args...)
 
 	if s.fileLogger == nil {
@@ -256,7 +268,18 @@ func (s *stdoutLogger) Fatalf(format string, args ...interface{}) {
 	s.logMutex.Lock()
 	defer s.logMutex.Unlock()
 
-	s.writeMessage(fatalFn, fmt.Sprintf(format, args...)+"\n")
+	if s.loadingText != nil {
+		s.loadingText.Stop()
+		s.loadingText = nil
+	}
+
+	fnInformation := fnTypeInformationMap[fatalFn]
+
+	ct.Foreground(fnInformation.color, false)
+	fnInformation.stream.Write([]byte(fnInformation.tag))
+
+	ct.ResetColor()
+	fnInformation.stream.Write([]byte(fmt.Sprintf(format, args...)))
 	s.writeMessageToFileLoggerf(fatalFn, format, args...)
 
 	if s.fileLogger == nil {
@@ -268,6 +291,11 @@ func (s *stdoutLogger) Panic(args ...interface{}) {
 	s.logMutex.Lock()
 	defer s.logMutex.Unlock()
 
+	if s.loadingText != nil {
+		s.loadingText.Stop()
+		s.loadingText = nil
+	}
+
 	s.writeMessage(panicFn, fmt.Sprintln(args...))
 	s.writeMessageToFileLogger(panicFn, args...)