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

diff --git a/log.go b/log.go
index 703f198..f4abdd0 100644
--- a/log.go
+++ b/log.go
@@ -1,6 +1,6 @@
 /*
 goredo -- djb's redo implementation on pure Go
-Copyright (C) 2020-2021 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2020-2023 Sergey Matveev <stargrave@stargrave.org>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -59,17 +59,17 @@ var (
 	CWarn  string
 	CJS    string
 	CReset string
-	CNone  string = "NONE"
+	CNone  = "NONE"
 
-	flagNoProgress = flag.Bool("no-progress", false, fmt.Sprintf("no progress printing (%s=1), also implies -no-status", EnvNoProgress))
 	flagDebug      = flag.Bool("d", false, fmt.Sprintf("enable debug logging (%s=1)", EnvDebug))
-	flagLogWait    = flag.Bool("log-wait", false, fmt.Sprintf("enable wait messages logging (%s=1)", EnvLogWait))
-	flagLogLock    = flag.Bool("log-lock", false, fmt.Sprintf("enable lock messages logging (%s=1)", EnvLogLock))
-	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
+	flagNoProgress *bool
+	flagLogWait    *bool
+	flagLogLock    *bool
+	flagLogPid     *bool
+	flagLogJS      *bool
+
+	LogMutex     sync.Mutex
+	KeyEraseLine string
 )
 
 func init() {
@@ -83,30 +83,41 @@ 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])
+
+	cmdName := CmdName()
+	if !(cmdName == CmdNameRedo || cmdName == CmdNameRedoIfchange) {
+		return
+	}
+	flagNoProgress = flag.Bool("no-progress", false,
+		fmt.Sprintf("no progress printing (%s=1), also implies -no-status", EnvNoProgress))
+	flagLogWait = flag.Bool("log-wait", false,
+		fmt.Sprintf("enable wait messages logging (%s=1)", EnvLogWait))
+	flagLogLock = flag.Bool("log-lock", false,
+		fmt.Sprintf("enable lock messages logging (%s=1)", EnvLogLock))
+	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))
 }
 
-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 NoProgress || NoColor {
+		return s + end
 	}
-	return s + end
+	return s + KeyEraseLine + end
 }
 
-func trace(level, format string, args ...interface{}) {
+func tracef(level, format string, args ...interface{}) {
 	var p string
 	if MyPid != 0 {
 		p = fmt.Sprintf("[%d] ", MyPid)
 	}
 	switch level {
 	case CNone:
+		p = erasedStatus(StderrPrefix+p+fmt.Sprintf(format, args...), "\n")
 		LogMutex.Lock()
-		os.Stderr.WriteString(fillUpToTermSize(
-			StderrPrefix+p+fmt.Sprintf(format, args...), "\n",
-		))
+		os.Stderr.WriteString(p)
 		LogMutex.Unlock()
 		return
 	case CDebug:
@@ -141,8 +152,9 @@ func trace(level, format string, args ...interface{}) {
 	}
 	msg := fmt.Sprintf(format, args...)
 	msg = StderrPrefix + colourize(level, p+strings.Repeat(". ", Level)+msg)
+	msg = erasedStatus(msg, "\n")
 	LogMutex.Lock()
-	os.Stderr.WriteString(fillUpToTermSize(msg, "\n"))
+	os.Stderr.WriteString(msg)
 	LogMutex.Unlock()
 }