add env prefix to getters

This commit is contained in:
2023-11-03 01:29:35 -07:00
parent 610b979966
commit 1d2bf65621

View File

@@ -7,12 +7,25 @@ import (
"time" "time"
) )
func (c *ConfigManager) Get(key string) any {
c.mutex.RLock()
defer c.mutex.RUnlock()
v, ok := c.combinedConfig[strings.ToLower(key)]
if !ok {
v, ok = c.envConfig[strings.ToLower(c.envPrefix+key)]
if !ok {
return nil
}
}
return v.Value
}
func (c *ConfigManager) GetBool(key string) bool { func (c *ConfigManager) GetBool(key string) bool {
c.mutex.RLock() c.mutex.RLock()
defer c.mutex.RUnlock() defer c.mutex.RUnlock()
v, ok := c.combinedConfig[strings.ToLower(key)] v, ok := c.combinedConfig[strings.ToLower(key)]
if !ok { if !ok {
v, ok = c.envConfig[strings.ToLower(key)] v, ok = c.envConfig[strings.ToLower(c.envPrefix+key)]
if !ok { if !ok {
return false return false
} }
@@ -53,7 +66,7 @@ func (c *ConfigManager) GetDuration(key string) time.Duration {
defer c.mutex.RUnlock() defer c.mutex.RUnlock()
v, ok := c.combinedConfig[strings.ToLower(key)] v, ok := c.combinedConfig[strings.ToLower(key)]
if !ok { if !ok {
v, ok = c.envConfig[strings.ToLower(key)] v, ok = c.envConfig[strings.ToLower(c.envPrefix+key)]
if !ok { if !ok {
return 0 return 0
} }
@@ -87,7 +100,7 @@ func (c *ConfigManager) GetString(key string) string {
defer c.mutex.RUnlock() defer c.mutex.RUnlock()
v, ok := c.combinedConfig[strings.ToLower(key)] v, ok := c.combinedConfig[strings.ToLower(key)]
if !ok { if !ok {
v, ok = c.envConfig[strings.ToLower(key)] v, ok = c.envConfig[strings.ToLower(c.envPrefix+key)]
if !ok { if !ok {
return "" return ""
} }
@@ -106,7 +119,7 @@ func (c *ConfigManager) GetStringMap(key string) map[string]any {
defer c.mutex.RUnlock() defer c.mutex.RUnlock()
v, ok := c.combinedConfig[strings.ToLower(key)] v, ok := c.combinedConfig[strings.ToLower(key)]
if !ok { if !ok {
v, ok = c.envConfig[strings.ToLower(key)] v, ok = c.envConfig[strings.ToLower(c.envPrefix+key)]
if !ok { if !ok {
return nil return nil
} }
@@ -124,7 +137,7 @@ func (c *ConfigManager) GetStringSlice(key string) []string {
defer c.mutex.RUnlock() defer c.mutex.RUnlock()
v, ok := c.combinedConfig[strings.ToLower(key)] v, ok := c.combinedConfig[strings.ToLower(key)]
if !ok { if !ok {
v, ok = c.envConfig[strings.ToLower(key)] v, ok = c.envConfig[strings.ToLower(c.envPrefix+key)]
if !ok { if !ok {
return nil return nil
} }
@@ -142,7 +155,7 @@ func (c *ConfigManager) GetInt(key string) int {
defer c.mutex.RUnlock() defer c.mutex.RUnlock()
v, ok := c.combinedConfig[strings.ToLower(key)] v, ok := c.combinedConfig[strings.ToLower(key)]
if !ok { if !ok {
v, ok = c.envConfig[strings.ToLower(key)] v, ok = c.envConfig[strings.ToLower(c.envPrefix+key)]
if !ok { if !ok {
return 0 return 0
} }
@@ -172,7 +185,7 @@ func (c *ConfigManager) GetIntSlice(key string) []int {
defer c.mutex.RUnlock() defer c.mutex.RUnlock()
v, ok := c.combinedConfig[strings.ToLower(key)] v, ok := c.combinedConfig[strings.ToLower(key)]
if !ok { if !ok {
v, ok = c.envConfig[strings.ToLower(key)] v, ok = c.envConfig[strings.ToLower(c.envPrefix+key)]
if !ok { if !ok {
return nil return nil
} }