diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2024-01-19 15:08:34 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2024-01-19 15:08:34 +0300 |
| commit | 7344cec8c24f1599086498ba19096cf9918ee168 (patch) | |
| tree | 9ea5ff98be0cfbe489d328c4aa00ebc4db34c743 /workhorse/main.go | |
| parent | ebcd8f42811c2cf265f442fcdbe4a4e3eb85f551 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'workhorse/main.go')
| -rw-r--r-- | workhorse/main.go | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/workhorse/main.go b/workhorse/main.go index 0c470d36e3e..4d14d60df92 100644 --- a/workhorse/main.go +++ b/workhorse/main.go @@ -138,16 +138,7 @@ func buildConfig(arg0 string, args []string) (*bootConfig, *config.Config, error cfg.CableBackend = cfg.Backend } - tomlData := "" - if *configFile != "" { - buf, err := os.ReadFile(*configFile) - if err != nil { - return nil, nil, fmt.Errorf("configFile: %v", err) - } - tomlData = string(buf) - } - - cfgFromFile, err := config.LoadConfig(tomlData) + cfgFromFile, err := config.LoadConfigFromFile(configFile) if err != nil { return nil, nil, fmt.Errorf("configFile: %v", err) } |