X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/ca06cfbda0e84d469f7810a280cfa4dfa8997260..47eaf671717bc185abd868e7ada9284214d318a5:/services/crunchstat/crunchstat.go diff --git a/services/crunchstat/crunchstat.go b/services/crunchstat/crunchstat.go index 454a5fc3a4..7e2dc01271 100644 --- a/services/crunchstat/crunchstat.go +++ b/services/crunchstat/crunchstat.go @@ -17,7 +17,6 @@ import ( "time" "git.curoverse.com/arvados.git/lib/crunchstat" - arvadosVersion "git.curoverse.com/arvados.git/sdk/go/version" ) const MaxLogLine = 1 << 14 // Child stderr lines >16KiB will be split @@ -25,6 +24,7 @@ const MaxLogLine = 1 << 14 // Child stderr lines >16KiB will be split var ( signalOnDeadPPID int = 15 ppidCheckInterval = time.Second + version = "dev" ) func main() { @@ -44,11 +44,11 @@ func main() { // Print version information if requested if *getVersion { - fmt.Printf("Version: %s\n", arvadosVersion.GetVersion()) - os.Exit(0) + fmt.Printf("crunchstat %s\n", version) + return } - reporter.Logger.Printf("crunchstat %q started", arvadosVersion.GetVersion()) + reporter.Logger.Printf("crunchstat %s started", version) if reporter.CgroupRoot == "" { reporter.Logger.Fatal("error: must provide -cgroup-root") @@ -107,7 +107,7 @@ func runCommand(argv []string, logger *log.Logger) error { } // Funnel stderr through our channel - stderr_pipe, err := cmd.StderrPipe() + stderrPipe, err := cmd.StderrPipe() if err != nil { logger.Fatalln("error in StderrPipe:", err) } @@ -121,7 +121,7 @@ func runCommand(argv []string, logger *log.Logger) error { os.Stdin.Close() os.Stdout.Close() - copyPipeToChildLog(stderr_pipe, log.New(os.Stderr, "", 0)) + copyPipeToChildLog(stderrPipe, log.New(os.Stderr, "", 0)) return cmd.Wait() }