debug
Some checks failed
continuous-integration/drone/pr Build is failing

This commit is contained in:
p4u1 2024-07-02 18:04:35 +02:00
parent 97ae6ac267
commit 399d430243
2 changed files with 10 additions and 0 deletions

View File

@ -1,6 +1,7 @@
package config
import (
"log"
"os"
"path"
"path/filepath"
@ -17,12 +18,14 @@ func LoadAbraConfig() Abra {
configFile := findAbraConfig(wd)
if configFile == "" {
logrus.Debugf("no config file found")
log.Println("no config file found")
return Abra{}
}
data, err := os.ReadFile(configFile)
if err != nil {
// Do nothing, when an error occurs
logrus.Debugf("error reading config file: %s", err)
log.Printf("error reading config file: %s", err)
return Abra{}
}
@ -31,6 +34,7 @@ func LoadAbraConfig() Abra {
if err != nil {
// Do nothing, when an error occurs
logrus.Debugf("error loading config file: %s", err)
log.Printf("error loading config file: %s", err)
return Abra{}
}
logrus.Debugf("config file loaded from: %s", configFile)
@ -45,17 +49,21 @@ func LoadAbraConfig() Abra {
func findAbraConfig(dir string) string {
dir, err := filepath.Abs(dir)
if err != nil {
log.Println("here")
return ""
}
if dir == os.ExpandEnv("$HOME") || dir == "/" {
log.Println("there")
return ""
}
p := path.Join(dir, "abra.yaml")
if _, err := os.Stat(p); err == nil {
log.Println("where", p)
return p
}
p = path.Join(dir, "abra.yml")
if _, err := os.Stat(p); err == nil {
log.Println("lhere", p)
return p
}
return findAbraConfig(filepath.Dir(dir))
@ -70,6 +78,7 @@ type Abra struct {
// GetAbraDir returns the abra dir. It has the following logic:
// 1. check if $ABRA_DIR is set
// 2. check if abraDir was set in a config file
// 3. use $HOME/.abra when above two options failed
func (a Abra) GetAbraDir() string {
if dir, exists := os.LookupEnv("ABRA_DIR"); exists && dir != "" {
return dir

View File

@ -74,6 +74,7 @@ func TestLoadAbraConfigGetAbraDir(t *testing.T) {
}
cfg := LoadAbraConfig()
log.Println(cfg.GetAbraDir())
wantAbraDir := filepath.Join(wd, "testdata/abraconfig1/abra.yaml/foobar")
if cfg.GetAbraDir() != wantAbraDir {
t.Errorf("\nwant: %s\ngot: %s", wantAbraDir, cfg.GetAbraDir())