diff options
| author | Alejandro Rodríguez <alejorro70@gmail.com> | 2017-10-10 20:18:32 +0300 |
|---|---|---|
| committer | Alejandro Rodríguez <alejorro70@gmail.com> | 2017-10-10 20:18:32 +0300 |
| commit | 05327c29550f34f4ff4d3d9b3502889271bd7d7d (patch) | |
| tree | 590c41c4031610926e15df493320f1a39c1a2d02 | |
| parent | 7df1c3b321f02055faf8451de5fca1f232d6008f (diff) | |
| parent | 7ce32eac11eb49c23d89c85e1bcd6f185908cba7 (diff) | |
Merge branch 'improve-load-colors-error' into 'master'
Improve 'load colors' error message
Closes #651
See merge request gitlab-org/gitaly!401
| -rw-r--r-- | cmd/gitaly/main.go | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/cmd/gitaly/main.go b/cmd/gitaly/main.go index 749a53253..e1f887a9c 100644 --- a/cmd/gitaly/main.go +++ b/cmd/gitaly/main.go @@ -42,7 +42,11 @@ func loadConfig(configPath string) error { return err } - return linguist.LoadColors() + if err := linguist.LoadColors(); err != nil { + return fmt.Errorf("load linguist colors: %v", err) + } + + return nil } // registerServerVersionPromGauge registers a label with the current server version |