diff options
| author | Zeger-Jan van de Weg <zegerjan@gitlab.com> | 2018-04-10 15:58:59 +0300 |
|---|---|---|
| committer | Zeger-Jan van de Weg <zegerjan@gitlab.com> | 2018-04-10 15:58:59 +0300 |
| commit | 8a142c7e265a0ed66cc90069cc5f85a3f7e04aa7 (patch) | |
| tree | 4e2ab609a0534f69c2b4eaae8e3a321b0b44f3c9 | |
| parent | 402b2b7d08eddd4367a74bee774965226f6ffd10 (diff) | |
| parent | d4df7846a843699ec4363eed551130a1094f1357 (diff) | |
Merge branch 'ruby-start-fatal' into 'master'
Make it a fatal error if gitaly-ruby can't start
See merge request gitlab-org/gitaly!667
| -rw-r--r-- | CHANGELOG.md | 4 | ||||
| -rw-r--r-- | cmd/gitaly/main.go | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index e6a4f5c1d..5941a41dc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,11 +2,13 @@ UNRELEASED +- Make it a fatal error if gitaly-ruby can't start + https://gitlab.com/gitlab-org/gitaly/merge_requests/667 - Tag log entries with repo.GlRepository https://gitlab.com/gitlab-org/gitaly/merge_requests/663 -v0.95.0 +v0.95.0 - Fix fragile checksum test https://gitlab.com/gitlab-org/gitaly/merge_requests/661 - Use rugged 0.27.0 diff --git a/cmd/gitaly/main.go b/cmd/gitaly/main.go index 79b2c8ba6..591387a59 100644 --- a/cmd/gitaly/main.go +++ b/cmd/gitaly/main.go @@ -161,8 +161,7 @@ func run(listeners []net.Listener) error { ruby, err := rubyserver.Start() if err != nil { - // TODO: this will be a fatal error in the future - log.WithError(err).Warn("failed to start ruby service") + return err } defer ruby.Stop() |