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:
authorAhmad Sherif <me@ahmadsherif.com>2017-10-10 17:14:19 +0300
committerAhmad Sherif <me@ahmadsherif.com>2017-10-10 18:30:18 +0300
commit65e0392a5b37827c960b2a8ae8c336b53165b4d0 (patch)
tree352060cea97035fafab54647b86f8dd3729e4cb7
parent7df1c3b321f02055faf8451de5fca1f232d6008f (diff)
Add a Rails logger to ruby-git
Fixes gitlab-ce#38943
-rw-r--r--CHANGELOG.md2
-rw-r--r--ruby/lib/gitlab/git.rb1
-rw-r--r--ruby/lib/gitlab/rails_logger.rb10
3 files changed, 13 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 98ca11a6f..40f08fdcc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
UNRELEASED
+- Add a Rails logger to ruby-git
+ https://gitlab.com/gitlab-org/gitaly/merge_requests/405
- Add `git version` to `gitaly_build_info` metrics
https://gitlab.com/gitlab-org/gitaly/merge_requests/400
- Use relative paths for git object dir attributes
diff --git a/ruby/lib/gitlab/git.rb b/ruby/lib/gitlab/git.rb
index 24916e4ab..ca779159c 100644
--- a/ruby/lib/gitlab/git.rb
+++ b/ruby/lib/gitlab/git.rb
@@ -11,6 +11,7 @@ require 'active_support/core_ext/enumerable'
# We split our mock implementation of Gitlab::GitalyClient into a separate file
require_relative 'gitaly_client.rb'
require_relative 'git_logger.rb'
+require_relative 'rails_logger.rb'
vendor_gitlab_git = '../../vendor/gitlab_git/'
diff --git a/ruby/lib/gitlab/rails_logger.rb b/ruby/lib/gitlab/rails_logger.rb
new file mode 100644
index 000000000..917bbb487
--- /dev/null
+++ b/ruby/lib/gitlab/rails_logger.rb
@@ -0,0 +1,10 @@
+require 'logger'
+
+module Rails
+ LOGGER = Logger.new(STDOUT)
+ LOGGER.level = 'info'
+
+ def self.logger
+ LOGGER
+ end
+end