diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab_init.rb | 6 | ||||
| -rw-r--r-- | lib/http_helper.rb | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/lib/gitlab_init.rb b/lib/gitlab_init.rb index 2767a62..9bd4e8f 100644 --- a/lib/gitlab_init.rb +++ b/lib/gitlab_init.rb @@ -1,3 +1,7 @@ -ROOT_PATH = File.expand_path('..', __dir__) +ROOT_PATH = ENV.fetch('GITLAB_SHELL_DIR', File.expand_path('..', __dir__)) + +# We are transitioning parts of gitlab-shell into the gitaly project. In +# gitaly, GITALY_EMBEDDED will be true. +GITALY_EMBEDDED = false require_relative 'gitlab_config' diff --git a/lib/http_helper.rb b/lib/http_helper.rb index c66df53..c6a4bb8 100644 --- a/lib/http_helper.rb +++ b/lib/http_helper.rb @@ -78,7 +78,8 @@ module HTTPHelper $logger.warn('Failed to connect', method: method.to_s.upcase, url: url, error: e) raise GitlabNet::ApiUnreachableError ensure - $logger.info('finished HTTP request', method: method.to_s.upcase, url: url, duration: Time.new - start_time) + fields = { method: method.to_s.upcase, url: url, duration: Time.new - start_time, gitaly_embedded: GITALY_EMBEDDED } + $logger.info('finished HTTP request', fields) end case response |