From a5940a24f08b0e33e213b67fb1c26bee96a65d6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Fri, 22 Jul 2022 15:51:17 +0200 Subject: [PATCH] Worker: load `flamenco-worker.yaml` from current directory By accident I made the worker load `flamenco-worker.yaml` from the "local files" directory (~/.local/share/flamenco on Linux) instead of the current directory. This was incorrect, as that file is meant to contain configuration that's shared between workers. --- internal/worker/config.go | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/internal/worker/config.go b/internal/worker/config.go index 00f9a102..81bc164b 100644 --- a/internal/worker/config.go +++ b/internal/worker/config.go @@ -71,12 +71,7 @@ func (fcw *FileConfigWrangler) WorkerConfig() (WorkerConfig, error) { } wc := fcw.DefaultConfig() - filepath, err := appinfo.InFlamencoHome(configFilename) - if err != nil { - return wc, err - } - - err = fcw.loadConfig(filepath, &wc) + err := fcw.loadConfig(configFilename, &wc) if err != nil { switch {