package main
import (
+ "bytes"
"flag"
"fmt"
"os"
"strings"
"sync"
+
+ "golang.org/x/term"
)
const (
EnvLogPid = "REDO_LOG_PID"
EnvLogJS = "REDO_LOG_JS"
EnvNoColor = "NO_COLOR"
-
- CReset = "\033[0m"
- CBold = "\033[1m"
- CBlack = "\033[30;1m"
- CRed = "\033[31;1m"
- CGreen = "\033[32;1m"
- CYellow = "\033[33;1m"
- CBlue = "\033[34;1m"
- CMagenta = "\033[35;1m"
- CCyan = "\033[36;1m"
- CWhite = "\033[37;1m"
-
- CDebug = CYellow
- CRedo = CGreen
- CWait = CBlue
- CLock = CCyan
- CErr = CRed
- CWarn = CMagenta
- CJS = CWhite
- CNone = "NONE"
)
var (
LogJS bool
MyPid int
+ CDebug string
+ CRedo string
+ CWait string
+ CLock string
+ CErr string
+ CWarn string
+ CJS string
+ CReset string
+ CNone string = "NONE"
+
flagDebug = flag.Bool("debug", 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
+ LogMutex sync.Mutex
+ LogLenPrev int
)
+func init() {
+ var b bytes.Buffer
+ t := term.NewTerminal(&b, "")
+ CDebug = string(t.Escape.Yellow)
+ CRedo = string(t.Escape.Green)
+ CWait = string(t.Escape.Blue)
+ CLock = string(t.Escape.Cyan)
+ CErr = string(t.Escape.Red)
+ CWarn = string(t.Escape.Magenta)
+ CJS = string(t.Escape.White)
+ CReset = string(t.Escape.Reset)
+}
+
+func fillUpToTermSize(s, end string) string {
+ sLen := len(s)
+ if sLen < LogLenPrev {
+ s += strings.Repeat(" ", LogLenPrev-sLen)
+ LogLenPrev = sLen
+ } else {
+ LogLenPrev = sLen
+ }
+ return s + end
+}
+
func trace(level, format string, args ...interface{}) {
var p string
if MyPid != 0 {
switch level {
case CNone:
LogMutex.Lock()
- os.Stderr.WriteString(StderrPrefix + p + fmt.Sprintf(format+"\n", args...))
+ os.Stderr.WriteString(fillUpToTermSize(
+ StderrPrefix+p+fmt.Sprintf(format, args...), "\n",
+ ))
LogMutex.Unlock()
return
case CDebug:
msg := fmt.Sprintf(format, args...)
msg = StderrPrefix + colourize(level, p+strings.Repeat(". ", Level)+msg)
LogMutex.Lock()
- os.Stderr.WriteString(msg + "\n")
+ os.Stderr.WriteString(fillUpToTermSize(msg, "\n"))
LogMutex.Unlock()
}