diff options
| author | Sami Hiltunen <shiltunen@gitlab.com> | 2020-03-09 17:28:30 +0300 |
|---|---|---|
| committer | Sami Hiltunen <shiltunen@gitlab.com> | 2020-03-09 17:28:30 +0300 |
| commit | 72995de447ddf76fbcef566b3286501922875f76 (patch) | |
| tree | 856d35dd944789c52b59384b9331db7da4cbaace | |
| parent | bedcf592fcafad2da8b3afad3b40d8ce21ba13a6 (diff) | |
| parent | 66c31d0f1d6c3c6f4e789bc2bc4783aee185f19e (diff) | |
Merge branch 'zj-cert-error-wrap' into 'master'
Explicit error what type of path can't be read
Closes #2508
See merge request gitlab-org/gitaly!1891
| -rw-r--r-- | changelogs/unreleased/zj-cert-error-wrap.yml | 5 | ||||
| -rw-r--r-- | internal/server/server.go | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/changelogs/unreleased/zj-cert-error-wrap.yml b/changelogs/unreleased/zj-cert-error-wrap.yml new file mode 100644 index 000000000..3e7ca9dae --- /dev/null +++ b/changelogs/unreleased/zj-cert-error-wrap.yml @@ -0,0 +1,5 @@ +--- +title: Explicit error what type of path can't be read +merge_request: 1891 +author: +type: fixed diff --git a/internal/server/server.go b/internal/server/server.go index 250749248..e4f4896b4 100644 --- a/internal/server/server.go +++ b/internal/server/server.go @@ -116,7 +116,7 @@ func createNewServer(rubyServer *rubyserver.Server, secure bool) *grpc.Server { if secure { cert, err := tls.LoadX509KeyPair(config.Config.TLS.CertPath, config.Config.TLS.KeyPath) if err != nil { - log.Fatal(err) + log.Fatalf("error reading certificate and key paths: %v", err) } opts = append(opts, grpc.Creds(credentials.NewServerTLSFromCert(&cert))) } |