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:
Diffstat (limited to 'internal/gitaly/config/config.go')
-rw-r--r--internal/gitaly/config/config.go10
1 files changed, 2 insertions, 8 deletions
diff --git a/internal/gitaly/config/config.go b/internal/gitaly/config/config.go
index e05ee173b..95214ce8f 100644
--- a/internal/gitaly/config/config.go
+++ b/internal/gitaly/config/config.go
@@ -231,12 +231,6 @@ func (cfg *Cfg) setDefaults() error {
cfg.Hooks.CustomHooksDir = filepath.Join(cfg.GitlabShell.Dir, "hooks")
}
- runtimeDir, err := SetupRuntimeDirectory(*cfg, os.Getpid())
- if err != nil {
- return err
- }
- cfg.RuntimeDir = runtimeDir
-
if reflect.DeepEqual(cfg.DailyMaintenance, DailyJob{}) {
cfg.DailyMaintenance = defaultMaintenanceWindow(cfg.Storages)
}
@@ -377,8 +371,8 @@ func (cfg *Cfg) validateBinDir() error {
}
func (cfg *Cfg) validateRuntimeDir() error {
- if len(cfg.RuntimeDir) == 0 {
- return fmt.Errorf("runtime_dir: is not set")
+ if cfg.RuntimeDir == "" {
+ return nil
}
if err := validateIsDirectory(cfg.RuntimeDir, "runtime_dir"); err != nil {