Use os.Getwd() instead of unix.Getwd()

[goredo.git] / log.go

diff --git a/log.go b/log.go
index f4fa2ca9c65f647b8aa1d48d71232984b76bed90..1a804355dafe689f140724786f17663606e32d51 100644 (file)
--- a/log.go
+++ b/log.go
@@ -20,10 +20,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 package main
 
 import (
+       "bytes"
        "flag"
        "fmt"
        "os"
        "strings"
+       "sync"
+
+       "golang.org/x/term"
 )
 
 const (
@@ -34,26 +38,6 @@ 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 (
@@ -65,13 +49,50 @@ var (
        LogJS   bool
        MyPid   int
 
-       flagDebug   = flag.Bool("debug", false, "enable debug logging (REDO_DEBUG=1)")
-       flagLogWait = flag.Bool("log-wait", false, "enable wait messages logging (REDO_LOG_WAIT=1)")
-       flagLogLock = flag.Bool("log-lock", false, "enable lock messages logging (REDO_LOG_LOCK=1)")
-       flagLogPid  = flag.Bool("log-pid", false, "append PIDs (REDO_LOG_PID=1)")
-       flagLogJS   = flag.Bool("log-js", false, "enable jobserver messages logging (REDO_LOG_JS=1)")
+       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
+       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 {
@@ -79,7 +100,11 @@ func trace(level, format string, args ...interface{}) {
        }
        switch level {
        case CNone:
-               os.Stderr.WriteString(StderrPrefix + p + fmt.Sprintf(format+"\n", args...))
+               LogMutex.Lock()
+               os.Stderr.WriteString(fillUpToTermSize(
+                       StderrPrefix+p+fmt.Sprintf(format, args...), "\n",
+               ))
+               LogMutex.Unlock()
                return
        case CDebug:
                if !Debug {
@@ -110,7 +135,9 @@ func trace(level, format string, args ...interface{}) {
        }
        msg := fmt.Sprintf(format, args...)
        msg = StderrPrefix + colourize(level, p+strings.Repeat(". ", Level)+msg)
-       os.Stderr.WriteString(msg + "\n")
+       LogMutex.Lock()
+       os.Stderr.WriteString(fillUpToTermSize(msg, "\n"))
+       LogMutex.Unlock()
 }
 
 func colourize(colour, s string) string {