Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Vosmaer (GitLab) <jacob@gitlab.com>2018-04-19 12:10:14 +0300
committerZeger-Jan van de Weg <zegerjan@gitlab.com>2018-04-19 12:10:14 +0300
commitde1d4959d23de70d08b3508ff9c8f939e280e8a5 (patch)
treea00eb9476de04891edacc959ff4e62f53c775ab8
parent05550a4193268637f4e6f9b96a7b3769f661415a (diff)
Make gitaly-ruby's grpc server log at level WARN
-rw-r--r--CHANGELOG.md2
-rwxr-xr-xruby/bin/gitaly-ruby13
2 files changed, 15 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7d87237d4..a4d2305bc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
UNRELEASED
+- Make gitaly-ruby's grpc server log at level WARN
+ https://gitlab.com/gitlab-org/gitaly/merge_requests/681
- Add health checks for gitaly-ruby
https://gitlab.com/gitlab-org/gitaly/merge_requests/678
- Add config option to point to languages.json
diff --git a/ruby/bin/gitaly-ruby b/ruby/bin/gitaly-ruby
index 115e5b6d4..87acda775 100755
--- a/ruby/bin/gitaly-ruby
+++ b/ruby/bin/gitaly-ruby
@@ -68,4 +68,17 @@ def start_parent_watcher(original_ppid, signal_thread)
end
end
+GRPC_LOGGER = Logger.new(STDOUT)
+GRPC_LOGGER.level = 'WARN'
+GRPC_LOGGER.progname = 'GRPC'
+GRPC_LOGGER.formatter = proc do |severity, datetime, progname, msg|
+ "GRPC-RUBY: #{severity}: #{msg}\n"
+end
+
+module GRPC
+ def self.logger
+ GRPC_LOGGER
+ end
+end
+
main