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.
This commit is contained in:
parent
284855f18f
commit
a5940a24f0
@ -71,12 +71,7 @@ func (fcw *FileConfigWrangler) WorkerConfig() (WorkerConfig, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
wc := fcw.DefaultConfig()
|
wc := fcw.DefaultConfig()
|
||||||
filepath, err := appinfo.InFlamencoHome(configFilename)
|
err := fcw.loadConfig(configFilename, &wc)
|
||||||
if err != nil {
|
|
||||||
return wc, err
|
|
||||||
}
|
|
||||||
|
|
||||||
err = fcw.loadConfig(filepath, &wc)
|
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
switch {
|
switch {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user