Various refactoring

[goredo.git] / main.go

diff --git a/main.go b/main.go
index d0d3ab282cac7bb30cbff76d4ff222f7ce82486a..42d83beb0fddb14f15a3f5addb8181b5c362c7f1 100644 (file)
--- a/main.go
+++ b/main.go
@@ -28,39 +28,14 @@ import (
        "path"
        "path/filepath"
        "strconv"
-       "sync"
 
        "go.cypherpunks.ru/recfile"
        "golang.org/x/sys/unix"
 )
 
-const (
-       RedoLevelEnv        = "REDO_LEVEL"
-       RedoDepFdEnv        = "REDO_DEP_FD"
-       RedoDirPrefixEnv    = "REDO_DIRPREFIX"
-       RedoBuildUUIDEnv    = "REDO_BUILD_UUID"
-       RedoStderrPrefixEnv = "REDO_STDERR_PREFIX"
-       RedoJSRFdEnv        = "REDO_JSR_FD"
-       RedoJSWFdEnv        = "REDO_JSW_FD"
-)
-
 var (
-       Level       = 0
-       Trace  bool = false
-       Force  bool = false
-       NoHash bool = false
-       NoSync bool = false
-       Cwd    string
-       Jobs   sync.WaitGroup
-
-       JobsN = flag.Uint("j", 1, "number of parallel jobs (0 for infinite)")
-
-       StderrKeep   bool = false
-       StderrSilent bool = false
-       StderrPrefix string
-
+       Cwd       string
        BuildUUID string
-       IsMaster  bool = false
 )
 
 func mustSetenv(key, value string) {
@@ -82,14 +57,6 @@ func mustParseFd(v, name string) *os.File {
 }
 
 func main() {
-       xflag := flag.Bool("x", false, "trace current target (sh -x) (set REDO_TRACE=1 for others too)")
-       stderrKeep := flag.Bool("stderr-keep", false, "keep job's stderr (REDO_STDERR_KEEP=1)")
-       stderrSilent := flag.Bool("stderr-silent", false, "do not print job's stderr (REDO_STDERR_SILENT=1)")
-       debug := flag.Bool("debug", false, "enable debug logging (REDO_DEBUG=1)")
-       logWait := flag.Bool("log-wait", false, "enable wait messages logging (REDO_LOG_WAIT=1)")
-       logLock := flag.Bool("log-lock", false, "enable lock messages logging (REDO_LOG_LOCK=1)")
-       logPid := flag.Bool("log-pid", false, "append PIDs (REDO_LOG_PID=1)")
-       logJS := flag.Bool("log-js", false, "enable jobserver messages logging (REDO_LOG_JS=1)")
        version := flag.Bool("version", false, "print version")
        warranty := flag.Bool("warranty", false, "print warranty information")
        symlinks := flag.Bool("symlinks", false, "create necessary symlinks in current direcotyr")
@@ -105,6 +72,7 @@ func main() {
                return
        }
        if *symlinks {
+               rc := 0
                for _, cmdName := range []string{
                        "redo",
                        "redo-always",
@@ -116,10 +84,11 @@ func main() {
                        "redo-whichdo",
                } {
                        if err := os.Symlink(os.Args[0], cmdName); err != nil {
-                               log.Fatalln(err)
+                               rc = 1
+                               log.Println(err)
                        }
                }
-               return
+               os.Exit(rc)
        }
        log.SetFlags(0)
 
@@ -129,11 +98,11 @@ func main() {
                panic(err)
        }
 
-       NoColor = os.Getenv("NO_COLOR") != ""
-       NoHash = os.Getenv("REDO_NO_HASH") == "1"
-       NoSync = os.Getenv("REDO_NO_SYNC") == "1"
+       NoColor = os.Getenv(EnvNoColor) != ""
+       NoHash = os.Getenv(EnvNoHash) == "1"
+       NoSync = os.Getenv(EnvNoSync) == "1"
 
-       TopDir = os.Getenv("REDO_TOP_DIR")
+       TopDir = os.Getenv(EnvTopDir)
        if TopDir != "" {
                TopDir, err = filepath.Abs(TopDir)
                if err != nil {
@@ -141,58 +110,59 @@ func main() {
                }
        }
 
-       if *stderrKeep {
-               mustSetenv("REDO_STDERR_KEEP", "1")
+       if *flagStderrKeep {
+               mustSetenv(EnvStderrKeep, "1")
        }
-       if *stderrSilent {
-               mustSetenv("REDO_STDERR_SILENT", "1")
+       if *flagStderrSilent {
+               mustSetenv(EnvStderrSilent, "1")
        }
-       if *debug {
-               mustSetenv("REDO_DEBUG", "1")
+       if *flagDebug {
+               mustSetenv(EnvDebug, "1")
        }
-       if *logWait {
-               mustSetenv("REDO_LOG_WAIT", "1")
+       if *flagLogWait {
+               mustSetenv(EnvLogWait, "1")
        }
-       if *logLock {
-               mustSetenv("REDO_LOG_LOCK", "1")
+       if *flagLogLock {
+               mustSetenv(EnvLogLock, "1")
        }
-       if *logPid {
-               mustSetenv("REDO_LOG_PID", "1")
+       if *flagLogPid {
+               mustSetenv(EnvLogPid, "1")
        }
-       if *logJS {
-               mustSetenv("REDO_LOG_JS", "1")
+       if *flagLogJS {
+               mustSetenv(EnvLogJS, "1")
        }
-       StderrKeep = os.Getenv("REDO_STDERR_KEEP") == "1"
-       StderrSilent = os.Getenv("REDO_STDERR_SILENT") == "1"
-       Debug = os.Getenv("REDO_DEBUG") == "1"
-       LogWait = os.Getenv("REDO_LOG_WAIT") == "1"
-       LogLock = os.Getenv("REDO_LOG_LOCK") == "1"
-       LogJS = os.Getenv("REDO_LOG_JS") == "1"
-       if Debug || os.Getenv("REDO_LOG_PID") == "1" {
+       StderrKeep = os.Getenv(EnvStderrKeep) == "1"
+       StderrSilent = os.Getenv(EnvStderrSilent) == "1"
+       Debug = os.Getenv(EnvDebug) == "1"
+       LogWait = os.Getenv(EnvLogWait) == "1"
+       LogLock = os.Getenv(EnvLogLock) == "1"
+       LogJS = os.Getenv(EnvLogJS) == "1"
+       if Debug || os.Getenv(EnvLogPid) == "1" {
                MyPid = os.Getpid()
        }
-       if *xflag {
+       if *flagTrace {
                Trace = true
        } else {
-               Trace = os.Getenv("REDO_TRACE") == "1"
+               Trace = os.Getenv(EnvTrace) == "1"
        }
 
        // Those are internal envs
-       StderrPrefix = os.Getenv(RedoStderrPrefixEnv)
-       if v := os.Getenv(RedoLevelEnv); v != "" {
-               level, err := strconv.ParseUint(v, 10, 64)
+       StderrPrefix = os.Getenv(EnvStderrPrefix)
+       if v := os.Getenv(EnvLevel); v != "" {
+               Level, err = strconv.Atoi(v)
                if err != nil {
                        panic(err)
                }
-               Level = int(level)
+               if Level < 0 {
+                       panic("negative " + EnvLevel)
+               }
        }
        var fdDep *os.File
-       if v := os.Getenv(RedoDepFdEnv); v != "" {
-               fdDep = mustParseFd(v, RedoDepFdEnv)
+       if v := os.Getenv(EnvDepFd); v != "" {
+               fdDep = mustParseFd(v, EnvDepFd)
        }
-       BuildUUID = os.Getenv(RedoBuildUUIDEnv)
+       BuildUUID = os.Getenv(EnvBuildUUID)
        if BuildUUID == "" {
-               IsMaster = true
                raw := new([16]byte)
                if _, err = io.ReadFull(rand.Reader, raw[:]); err != nil {
                        panic(err)
@@ -223,7 +193,7 @@ CmdSwitch:
                writeDeps(fdDep, tgts)
        case "redo-ifcreate":
                if fdDep == nil {
-                       log.Fatalln("no", RedoDepFdEnv)
+                       log.Fatalln("no", EnvDepFd)
                }
                for _, tgt := range tgts {
                        err = ifcreate(fdDep, tgt)
@@ -233,7 +203,7 @@ CmdSwitch:
                }
        case "redo-always":
                if fdDep == nil {
-                       log.Fatalln("no", RedoDepFdEnv)
+                       log.Fatalln("no", EnvDepFd)
                }
                err = always(fdDep)
        case "redo-cleanup":
@@ -245,7 +215,7 @@ CmdSwitch:
                }
        case "redo-stamp":
                if fdDep == nil {
-                       log.Fatalln("no", RedoDepFdEnv)
+                       log.Fatalln("no", EnvDepFd)
                }
                err = stamp(fdDep, os.Stdin)
        case "redo-log":