X-Git-Url: http://www.git.cypherpunks.ru/?p=goredo.git;a=blobdiff_plain;f=log.go;h=f4248de80d30a9d73146d688489f0d18efb2b886;hp=703f198368d7b9886c91029962c58a4f3b40dead;hb=ff2443f496cbf7f648b84a78e468dc3f130c37f2;hpb=a9278680413807017c52f41920a307e695060bc2

diff --git a/log.go b/log.go
index 703f198..f4248de 100644
--- a/log.go
+++ b/log.go
@@ -68,8 +68,9 @@ var (
 	flagLogPid     = flag.Bool("log-pid", false, fmt.Sprintf("append PIDs (%s=1)", EnvLogPid))
 	flagLogJS      = flag.Bool("log-js", false, fmt.Sprintf("enable jobserver messages logging (%s=1)", EnvLogJS))
 
-	LogMutex   sync.Mutex
-	LogLenPrev int
+	LogMutex     sync.Mutex
+	KeyEraseLine string
+	LogWasStatus bool
 )
 
 func init() {
@@ -83,15 +84,12 @@ func init() {
 	CWarn = string(t.Escape.Magenta)
 	CJS = string(t.Escape.White)
 	CReset = string(t.Escape.Reset)
+	KeyEraseLine = fmt.Sprintf("%s[K", CReset[0:1])
 }
 
-func fillUpToTermSize(s, end string) string {
-	sLen := len(s)
-	if sLen < LogLenPrev {
-		s += strings.Repeat(" ", LogLenPrev-sLen)
-		LogLenPrev = sLen
-	} else {
-		LogLenPrev = sLen
+func erasedStatus(s, end string) string {
+	if LogWasStatus {
+		s += KeyEraseLine
 	}
 	return s + end
 }
@@ -103,10 +101,10 @@ func trace(level, format string, args ...interface{}) {
 	}
 	switch level {
 	case CNone:
+		p = StderrPrefix + p + fmt.Sprintf(format, args...)
 		LogMutex.Lock()
-		os.Stderr.WriteString(fillUpToTermSize(
-			StderrPrefix+p+fmt.Sprintf(format, args...), "\n",
-		))
+		os.Stderr.WriteString(erasedStatus(p, "\n"))
+		LogWasStatus = false
 		LogMutex.Unlock()
 		return
 	case CDebug:
@@ -142,7 +140,8 @@ func trace(level, format string, args ...interface{}) {
 	msg := fmt.Sprintf(format, args...)
 	msg = StderrPrefix + colourize(level, p+strings.Repeat(". ", Level)+msg)
 	LogMutex.Lock()
-	os.Stderr.WriteString(fillUpToTermSize(msg, "\n"))
+	os.Stderr.WriteString(erasedStatus(msg, "\n"))
+	LogWasStatus = false
 	LogMutex.Unlock()
 }