diff options
| author | Jacob Vosmaer (GitLab) <jacob@gitlab.com> | 2017-06-02 12:31:40 +0300 |
|---|---|---|
| committer | Jacob Vosmaer (GitLab) <jacob@gitlab.com> | 2017-06-02 12:31:40 +0300 |
| commit | 85194d18440a21dc0f5daceec8f040d16acaab3e (patch) | |
| tree | 8bb7ef453509e1c7ae1d3aca5341e3ed288b25aa | |
| parent | 92ea478743d0476c05fcaa90d43318f00a657733 (diff) | |
| parent | 365b37b789dc7e07c416e45e6d3be3bd203b99ae (diff) | |
Merge branch 'grpc-logging-adapter' into 'master'
Ensure that grpc server log messages are sent to logrus
See merge request !174
| -rw-r--r-- | CHANGELOG.md | 4 | ||||
| -rw-r--r-- | cmd/gitaly/main.go | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 3f92dadd3..e5acd07f7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,7 +20,9 @@ UNRELEASED https://gitlab.com/gitlab-org/gitaly/merge_requests/169 - Handle server side errors from shallow clone https://gitlab.com/gitlab-org/gitaly/merge_requests/173 - +- Ensure that grpc server log messages are sent to logrus + https://gitlab.com/gitlab-org/gitaly/merge_requests/174 + v0.10.0 - CommitDiff: Parse a typechange diff correctly diff --git a/cmd/gitaly/main.go b/cmd/gitaly/main.go index 4a0dfe115..b09a7dc8d 100644 --- a/cmd/gitaly/main.go +++ b/cmd/gitaly/main.go @@ -20,6 +20,7 @@ import ( "github.com/prometheus/client_golang/prometheus/promhttp" "google.golang.org/grpc" + "google.golang.org/grpc/grpclog" "google.golang.org/grpc/reflection" ) @@ -84,6 +85,7 @@ func main() { } config.ConfigureLogging() + grpclog.SetLogger(log.StandardLogger()) var listeners []net.Listener |