X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/92656b214ed120c631bc6adab3b35992939e2ced..7ab77ac9278fa130ac5063232a7763b15ee069cc:/services/crunchstat/crunchstat.go

diff --git a/services/crunchstat/crunchstat.go b/services/crunchstat/crunchstat.go
index 248ec6259d..7e2dc01271 100644
--- a/services/crunchstat/crunchstat.go
+++ b/services/crunchstat/crunchstat.go
@@ -44,11 +44,11 @@ func main() {
 
 	// Print version information if requested
 	if *getVersion {
-		fmt.Printf("Version: %s\n", version)
-		os.Exit(0)
+		fmt.Printf("crunchstat %s\n", version)
+		return
 	}
 
-	reporter.Logger.Printf("crunchstat %q started", version)
+	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()
 }