diff options
| author | Jacob Vosmaer <jacob@gitlab.com> | 2019-04-08 18:15:57 +0300 |
|---|---|---|
| committer | Jacob Vosmaer <jacob@gitlab.com> | 2019-04-08 18:15:57 +0300 |
| commit | 6ebfe26769a59850c1023f3573d70feaa8a1956a (patch) | |
| tree | d88578753d1e997cb5c2fb99653d66bc1151173f | |
| parent | 331aea8e497335630548fb816d89395d9313012c (diff) | |
Rename Run to Wait
| -rw-r--r-- | cmd/gitaly/main.go | 2 | ||||
| -rw-r--r-- | internal/bootstrap/bootstrap.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cmd/gitaly/main.go b/cmd/gitaly/main.go index ff1e0f3d6..6ee0928e4 100644 --- a/cmd/gitaly/main.go +++ b/cmd/gitaly/main.go @@ -205,7 +205,7 @@ func main() { log.WithError(err).Fatal("unable to start listeners") } - log.WithError(b.Run()).Error("shutting down") + log.WithError(b.Wait()).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 7c70635bb..002fca920 100644 --- a/internal/bootstrap/bootstrap.go +++ b/internal/bootstrap/bootstrap.go @@ -122,7 +122,7 @@ func (b *Bootstrap) Start() error { return nil } -func (b *Bootstrap) Run() error { +func (b *Bootstrap) Wait() error { signals := []os.Signal{syscall.SIGTERM, syscall.SIGINT} immediateShutdown := make(chan os.Signal, len(signals)) signal.Notify(immediateShutdown, signals...) |