Ability to disable redo progress printing at all

diff --git a/log.go b/log.go
index 1a804355dafe689f140724786f17663606e32d51..e1586c7907586f9830e603e7f64b2bcd3c78081c 100644 (file)
--- a/log.go
+++ b/log.go
@@ -31,23 +31,25 @@ import (
 )
 
 const (
-       EnvLevel   = "REDO_LEVEL"
-       EnvDebug   = "REDO_DEBUG"
-       EnvLogWait = "REDO_LOG_WAIT"
-       EnvLogLock = "REDO_LOG_LOCK"
-       EnvLogPid  = "REDO_LOG_PID"
-       EnvLogJS   = "REDO_LOG_JS"
-       EnvNoColor = "NO_COLOR"
+       EnvLevel      = "REDO_LEVEL"
+       EnvNoProgress = "REDO_NO_PROGRESS"
+       EnvDebug      = "REDO_DEBUG"
+       EnvLogWait    = "REDO_LOG_WAIT"
+       EnvLogLock    = "REDO_LOG_LOCK"
+       EnvLogPid     = "REDO_LOG_PID"
+       EnvLogJS      = "REDO_LOG_JS"
+       EnvNoColor    = "NO_COLOR"
 )
 
 var (
-       Level   = 0
-       NoColor bool
-       Debug   bool
-       LogWait bool
-       LogLock bool
-       LogJS   bool
-       MyPid   int
+       Level      = 0
+       NoColor    bool
+       NoProgress bool
+       Debug      bool
+       LogWait    bool
+       LogLock    bool
+       LogJS      bool
+       MyPid      int
 
        CDebug string
        CRedo  string
@@ -59,11 +61,12 @@ var (
        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))
+       flagNoProgress = flag.Bool("no-progress", false, fmt.Sprintf("no progress printing (%s=1), also implies -no-status", EnvNoProgress))
+       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
@@ -117,6 +120,9 @@ func trace(level, format string, args ...interface{}) {
                }
                p += "wait "
        case CRedo:
+               if NoProgress {
+                       return
+               }
                p += "redo "
        case CLock:
                if !(LogLock || Debug) {

diff --git a/main.go b/main.go
index bd82de25075e2514f81be9477212712ddc7f96e6..cd897720079423090d8e7dca9ad754dba162e2a4 100644 (file)
--- a/main.go
+++ b/main.go
@@ -119,6 +119,9 @@ func main() {
        if *flagStderrSilent {
                mustSetenv(EnvStderrSilent, "1")
        }
+       if *flagNoProgress {
+               mustSetenv(EnvNoProgress, "1")
+       }
        if *flagDebug {
                mustSetenv(EnvDebug, "1")
        }
@@ -136,6 +139,7 @@ func main() {
        }
        StderrKeep = os.Getenv(EnvStderrKeep) == "1"
        StderrSilent = os.Getenv(EnvStderrSilent) == "1"
+       NoProgress = os.Getenv(EnvNoProgress) == "1"
        Debug = os.Getenv(EnvDebug) == "1"
        LogWait = os.Getenv(EnvLogWait) == "1"
        LogLock = os.Getenv(EnvLogLock) == "1"

diff --git a/status.go b/status.go
index 994e431d57739f1848c386b92003338cea2f0e98..b918c65671dfbe5ebedb32dfadc9a43a5adcac7b 100644 (file)
--- a/status.go
+++ b/status.go
@@ -40,7 +40,7 @@ var (
 )
 
 func statusInit() {
-       if *flagNoStatus {
+       if NoProgress || *flagNoStatus {
                return
        }
        if v := os.Getenv(EnvNoStatus); v == "1" {

diff --git a/usage.go b/usage.go
index 12f4f9821c22b3fd566075eef382c5fa2de90aec..035cff35c2928fec75a2d88a3ccd57da7674b615 100644 (file)
--- a/usage.go
+++ b/usage.go
@@ -26,7 +26,7 @@ import (
 )
 
 const (
-       Version  = "0.6.2"
+       Version  = "0.7.0"
        Warranty = `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
 the Free Software Foundation, version 3 of the License.