Return error from Run()

2 files changed, 4 insertions, 7 deletions

diff --git a/cmd/gitaly/main.go b/cmd/gitaly/main.go
index e97b7b2a2..29e3d2b81 100644
--- a/cmd/gitaly/main.go
+++ b/cmd/gitaly/main.go
@@ -209,9 +209,7 @@ func main() {
 		log.WithError(err).Fatal("unable to start listeners")
 	}
 
-	b.Run()
-
-	log.Error("shutting down")
+	log.WithError(b.Run()).Error("shutting down")
 }
 
 func createUnixListener(listen bootstrap.ListenFunc, socketPath string, removeOld bool) (net.Listener, error) {
diff --git a/internal/bootstrap/bootstrap.go b/internal/bootstrap/bootstrap.go
index b883ac4f1..7c70635bb 100644
--- a/internal/bootstrap/bootstrap.go
+++ b/internal/bootstrap/bootstrap.go
@@ -122,14 +122,13 @@ func (b *Bootstrap) Start() error {
 	return nil
 }
 
-func (b *Bootstrap) Run() {
+func (b *Bootstrap) Run() error {
 	signals := []os.Signal{syscall.SIGTERM, syscall.SIGINT}
 	immediateShutdown := make(chan os.Signal, len(signals))
 	signal.Notify(immediateShutdown, signals...)
 
 	if err := b.upgrader.Ready(); err != nil {
-		log.WithError(err).Error("incomplete bootstrap")
-		return
+		return err
 	}
 
 	var err error
@@ -149,7 +148,7 @@ func (b *Bootstrap) Run() {
 
 	close(b.Stop)
 
-	log.WithError(err).Error("terminating")
+	return err
 }
 
 func (b *Bootstrap) waitGracePeriod(kill <-chan os.Signal) {