6 files changed, 27 insertions, 15 deletions
diff --git a/cmd/gitaly-backup/main.go b/cmd/gitaly-backup/main.go
index f663be660..6c12d1926 100644
--- a/cmd/gitaly-backup/main.go
+++ b/cmd/gitaly-backup/main.go
@@ -32,13 +32,15 @@ func main() {
 	_ = flags.Parse(os.Args)
 
 	if flags.NArg() < 2 {
-		logger.Fatal("missing subcommand")
+		logger.Error("missing subcommand")
+		os.Exit(1)
 	}
 
 	subcmdName := flags.Arg(1)
 	subcmd, ok := subcommands[subcmdName]
 	if !ok {
-		logger.Fatalf("unknown subcommand: %q", flags.Arg(1))
+		logger.Errorf("unknown subcommand: %q", flags.Arg(1))
+		os.Exit(1)
 	}
 
 	subcmdFlags := flag.NewFlagSet(subcmdName, flag.ExitOnError)
@@ -47,10 +49,12 @@ func main() {
 
 	ctx, err := storage.InjectGitalyServersEnv(context.Background())
 	if err != nil {
-		logger.Fatalf("%s", err)
+		logger.Errorf("%s", err)
+		os.Exit(1)
 	}
 
 	if err := subcmd.Run(ctx, logger, os.Stdin, os.Stdout); err != nil {
-		logger.Fatalf("%s", err)
+		logger.Errorf("%s", err)
+		os.Exit(1)
 	}
 }
diff --git a/cmd/gitaly-blackbox/main.go b/cmd/gitaly-blackbox/main.go
index a0a520af3..b71ab54f7 100644
--- a/cmd/gitaly-blackbox/main.go
+++ b/cmd/gitaly-blackbox/main.go
@@ -50,7 +50,8 @@ func main() {
 	prometheus.MustRegister(bb)
 
 	if err := bb.Run(); err != nil {
-		logger.WithError(err).Fatal()
+		logger.WithError(err).Error("blackbox probe failed")
+		os.Exit(1)
 	}
 }
 
diff --git a/cmd/gitaly-lfs-smudge/main.go b/cmd/gitaly-lfs-smudge/main.go
index 846d94a68..85d3fdc14 100644
--- a/cmd/gitaly-lfs-smudge/main.go
+++ b/cmd/gitaly-lfs-smudge/main.go
@@ -47,7 +47,7 @@ func main() {
 	defer closer.Close()
 
 	if err := run(ctx, os.Environ(), os.Stdout, os.Stdin, logger); err != nil {
-		logger.WithError(err).Error(err)
+		logger.WithError(err).Error("gitaly-lfs-smudge failed")
 		os.Exit(1)
 	}
 }
diff --git a/cmd/gitaly-lfs-smudge/smudge.go b/cmd/gitaly-lfs-smudge/smudge.go
index 3b5481acd..69554e766 100644
--- a/cmd/gitaly-lfs-smudge/smudge.go
+++ b/cmd/gitaly-lfs-smudge/smudge.go
@@ -311,7 +311,7 @@ func smudgeOneObject(ctx context.Context, cfg smudge.Config, gitlabClient *gitla
 	}
 
 	if err := response.Body.Close(); err != nil {
-		logger.WithError(err).Error("closing LFS pointer body: %w", err)
+		logger.WithError(err).Error("closing LFS pointer body failed")
 	}
 
 	return io.NopCloser(contents), nil
diff --git a/cmd/gitaly-ssh/main.go b/cmd/gitaly-ssh/main.go
index b34e99f32..4b4138abb 100644
--- a/cmd/gitaly-ssh/main.go
+++ b/cmd/gitaly-ssh/main.go
@@ -50,7 +50,8 @@ func main() {
 	// < 4 since git throws on 2x garbage here
 	if n := len(os.Args); n < 4 {
 		// TODO: Errors needs to be sent back some other way... pipes?
-		logger.Fatalf("invalid number of arguments, expected at least 1, got %d", n-1)
+		logger.Errorf("invalid number of arguments, expected at least 1, got %d", n-1)
+		os.Exit(1)
 	}
 
 	command := os.Args[1]
@@ -67,7 +68,8 @@ func main() {
 	case "upload-archive":
 		packer = uploadArchive
 	default:
-		logger.Fatalf("invalid pack command: %q", command)
+		logger.Errorf("invalid pack command: %q", command)
+		os.Exit(1)
 	}
 
 	cmd := gitalySSHCommand{
@@ -80,7 +82,8 @@ func main() {
 
 	code, err := cmd.run(logger)
 	if err != nil {
-		logger.Printf("%s: %v", command, err)
+		logger.Infof("%s: %v", command, err)
+		os.Exit(1)
 	}
 
 	os.Exit(code)
diff --git a/cmd/gitaly-wrapper/main.go b/cmd/gitaly-wrapper/main.go
index c1ab2bc3b..fda9d04c0 100644
--- a/cmd/gitaly-wrapper/main.go
+++ b/cmd/gitaly-wrapper/main.go
@@ -36,7 +36,8 @@ func main() {
 	logger = logger.WithField("wrapper", os.Getpid())
 
 	if len(os.Args) < 2 {
-		logger.Fatalf("usage: %s forking_binary [args]", os.Args[0])
+		logger.Errorf("usage: %s forking_binary [args]", os.Args[0])
+		os.Exit(1)
 	}
 
 	binary, arguments := os.Args[1], os.Args[2:]
@@ -45,13 +46,15 @@ func main() {
 
 	pidFilePath := os.Getenv(bootstrap.EnvPidFile)
 	if pidFilePath == "" {
-		logger.Fatalf("missing pid file ENV variable %q", bootstrap.EnvPidFile)
+		logger.Errorf("missing pid file ENV variable %q", bootstrap.EnvPidFile)
+		os.Exit(1)
 	}
 	logger.WithField("pid_file", pidFilePath).Info("finding process")
 
 	process, err := findProcess(pidFilePath)
 	if err != nil && !isRecoverable(err) {
-		logger.WithError(err).Fatal("find process")
+		logger.WithError(err).Errorf("find process")
+		os.Exit(1)
 	} else if err != nil {
 		logger.WithError(err).Error("find process")
 	}
@@ -63,7 +66,8 @@ func main() {
 
 		proc, err := spawnProcess(logger, binary, arguments)
 		if err != nil {
-			logger.WithError(err).Fatal("spawn gitaly")
+			logger.WithError(err).Errorf("spawn gitaly")
+			os.Exit(1)
 		}
 
 		process = proc
@@ -143,7 +147,7 @@ func forwardSignals(gitaly *os.Process, log log.Logger) {
 				continue
 			}
 
-			log.WithField("signal", sig).Warning("forwarding signal")
+			log.WithField("signal", sig).Warn("forwarding signal")
 
 			if err := gitaly.Signal(sig); err != nil {
 				log.WithField("signal", sig).WithError(err).Error("can't forward the signal")