dan/my-log
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

✨ Allow MYLOG_CONFIG_PATH to override the config path

Browse source
This commit is contained in:
Dan Jones 2026-03-09 16:48:58 -05:00
commit edf10de879
4 changed files with 18 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

10
config/load.go
View file

@ -32,7 +32,7 @@ func AddToContext(ctx context.Context, v *viper.Viper) context.Context {
return context.WithValue(ctx, viperKey, v)
}
func New(ctx context.Context) (context.Context, *viper.Viper, error) {
func New(ctx context.Context, path string) (context.Context, *viper.Viper, error) {
v := viper.New()
v.SetConfigType("toml")
@ -40,12 +40,16 @@ func New(ctx context.Context) (context.Context, *viper.Viper, error) {
return ctx, nil, err
}
v.SetConfigFile(DefaultPath())
if path == "" {
path = DefaultPath()
}
v.SetConfigFile(path)
v.SetEnvPrefix("MYLOG")
v.AutomaticEnv()
v.SetEnvKeyReplacer(strings.NewReplacer(".", "_", "-", "_"))
if err := v.ReadInConfig(); err != nil {
if err := v.MergeInConfig(); err != nil {
return ctx, nil, err
}

9
config/load_test.go
View file

@ -9,7 +9,7 @@ import (
)
func TestNew(t *testing.T) {
_, v, err := New(t.Context())
_, v, err := New(t.Context(), "")
be.Err(t, err, nil)
be.True(t, v != nil)
}
@ -18,7 +18,7 @@ func TestNewWithEnvOverrides(t *testing.T) {
os.Setenv("MYLOG_INPUT_PATH", "/test/path")
defer os.Unsetenv("MYLOG_INPUT_PATH")
_, v, err := New(t.Context())
_, v, err := New(t.Context(), "")
be.Err(t, err, nil)
be.Equal(t, v.GetString("input.path"), "/test/path")
}
@ -32,12 +32,9 @@ path = "/file/path"
ext = "log"`)
f.Close()
_, v, err := New(t.Context())
_, v, err := New(t.Context(), f.Name())
be.Err(t, err, nil)
v.SetConfigFile(f.Name())
v.SetConfigType("toml")
err = v.ReadInConfig()
be.Err(t, err, nil)
be.Equal(t, v.GetString("input.path"), "/file/path")
be.Equal(t, v.GetString("input.ext"), "log")