From a3d6bbf97e90bf923142d061bc68b28cc1dec2a8 Mon Sep 17 00:00:00 2001
From: Sergey Matveev <stargrave@stargrave.org>
Date: Tue, 5 Jan 2021 19:44:08 +0300
Subject: [PATCH] Ability to disable redo progress printing at all

---
 log.go    | 44 +++++++++++++++++++++++++-------------------
 main.go   |  4 ++++
 status.go |  2 +-
 usage.go  |  2 +-
 4 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/log.go b/log.go
index 1a80435..e1586c7 100644
--- 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 bd82de2..cd89772 100644
--- 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 994e431..b918c65 100644
--- 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 12f4f98..035cff3 100644
--- 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.
-- 
2.44.0