diff options
| author | Jacob Vosmaer (out of office May 10-14) <jacob@gitlab.com> | 2018-05-15 04:17:28 +0300 |
|---|---|---|
| committer | Kim Carlbäcker <kim.carlbacker@gmail.com> | 2018-05-15 04:17:28 +0300 |
| commit | 241a14f9d671670dea4bf4574ae21864c566e48c (patch) | |
| tree | db52e3c3427bd99995a20f7c77f8556b70a60994 | |
| parent | 7f321450cf828b0cec3808355d4adfb37f6a0fa4 (diff) | |
Add gitaly-ruby installation debug log messages
| -rw-r--r-- | CHANGELOG.md | 5 | ||||
| -rw-r--r-- | Makefile | 2 | ||||
| -rwxr-xr-x | ruby/bin/gitaly-ruby | 1 | ||||
| -rwxr-xr-x | ruby/bin/ruby-cd | 2 |
4 files changed, 10 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 58a968991..0f091eac8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Gitaly changelog +UNRELEASED + +- Add gitaly-ruby installation debug log messages + https://gitlab.com/gitlab-org/gitaly/merge_requests/710 + v0.100.0 - Fix WikiFindPage when the page has invalidly-encoded content @@ -56,7 +56,9 @@ build: .ruby-bundle $(TARGET_SETUP) cp $(foreach cmd,$(COMMANDS),$(BIN_BUILD_DIR)/$(cmd)) $(BUILD_DIR)/ .ruby-bundle: ruby/Gemfile.lock ruby/Gemfile + cd ruby && bundle config # for debugging cd ruby && bundle install $(BUNDLE_FLAGS) + cd ruby && bundle show gitaly-proto # sanity check touch $@ # TODO: confirm what references this target? Omnibus? Source installs? diff --git a/ruby/bin/gitaly-ruby b/ruby/bin/gitaly-ruby index 87acda775..7c16d2f0e 100755 --- a/ruby/bin/gitaly-ruby +++ b/ruby/bin/gitaly-ruby @@ -35,6 +35,7 @@ def main s.add_http2_port(port, :this_port_is_insecure) GRPC.logger.info("... running insecurely on #{port}") + GRPC.logger.warn("Using gitaly-proto #{Gitaly::VERSION}") GitalyServer.register_handlers(s) signal_thread = Thread.new do diff --git a/ruby/bin/ruby-cd b/ruby/bin/ruby-cd index 9dfb91e84..9c60fcd42 100755 --- a/ruby/bin/ruby-cd +++ b/ruby/bin/ruby-cd @@ -2,5 +2,7 @@ # This script lets you run `bundle exec` in one directory, and then changes into another. +warn "PID #{Process.pid} BUNDLE_GEMFILE=#{ENV['BUNDLE_GEMFILE']}" + Dir.chdir(ARGV.shift) exec(*ARGV) |