Commit 90cbf119 authored by Stan Hu's avatar Stan Hu

Fix gitaly-ruby not starting on test

gitaly-ruby added logging in
https://gitlab.com/gitlab-org/gitaly/-/merge_requests/2678, but by
default it will save the file in /. To avoid crashing, save it inside
the Rails log directory.

The Gitaly default dir will be adjusted in
https://gitlab.com/gitlab-org/gitaly/-/merge_requests/2678.
parent 2329d705
...@@ -99,6 +99,7 @@ module Gitlab ...@@ -99,6 +99,7 @@ module Gitlab
config[:'gitlab-shell'] = { dir: Gitlab.config.gitlab_shell.path } config[:'gitlab-shell'] = { dir: Gitlab.config.gitlab_shell.path }
config[:bin_dir] = Gitlab.config.gitaly.client_path config[:bin_dir] = Gitlab.config.gitaly.client_path
config[:gitlab] = { url: Gitlab.config.gitlab.url } config[:gitlab] = { url: Gitlab.config.gitlab.url }
config[:logging] = { dir: Rails.root.join('log').to_s }
TomlRB.dump(config) TomlRB.dump(config)
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment