ExternalVendorCode/LocalAI
1
0
Fork 0
mirror of https://github.com/mudler/LocalAI.git synced 2025-05-07 11:08:27 +00:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity

fix: api key polling was not using correct filepath (#2132)

Browse Source 
Signed-off-by: Chris Jowett <421501+cryptk@users.noreply.github.com>
This commit is contained in:
cryptk 2024-04-25 15:06:22 -05:00 committed by GitHub
parent 45761f8be2
commit d98063e80e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/startup/config_file_watcher.go
View File

@ -5,6 +5,7 @@ import (
"fmt" "fmt"
"os" "os"
"path" "path"
"path/filepath"
"time" "time"
"github.com/fsnotify/fsnotify" "github.com/fsnotify/fsnotify"
@ -50,6 +51,7 @@ func (c *configFileHandler) Register(filename string, handler fileHandler, runNo
} }
func (c *configFileHandler) callHandler(filename string, handler fileHandler) { func (c *configFileHandler) callHandler(filename string, handler fileHandler) {
log.Trace().Str("filename", filename).Msg("reading file for dynamic config update")
fileContent, err := os.ReadFile(filename) fileContent, err := os.ReadFile(filename)
if err != nil && !os.IsNotExist(err) { if err != nil && !os.IsNotExist(err) {
log.Error().Err(err).Str("filename", filename).Msg("could not read file") log.Error().Err(err).Str("filename", filename).Msg("could not read file")
@ -75,7 +77,7 @@ func (c *configFileHandler) Watch() error {
<-ticker.C <-ticker.C
for file, handler := range c.handlers { for file, handler := range c.handlers {
log.Debug().Str("file", file).Msg("polling config file") log.Debug().Str("file", file).Msg("polling config file")
c.callHandler(file, handler) c.callHandler(filepath.Join(c.appConfig.DynamicConfigsDir, file), handler)
} }
} }
}() }()
@ -122,7 +124,8 @@ func (c *configFileHandler) Stop() {
func readApiKeysJson(startupAppConfig config.ApplicationConfig) fileHandler { func readApiKeysJson(startupAppConfig config.ApplicationConfig) fileHandler {
handler := func(fileContent []byte, appConfig *config.ApplicationConfig) error { handler := func(fileContent []byte, appConfig *config.ApplicationConfig) error {
log.Debug().Msg("processing api_keys.json") log.Debug().Msg("processing api keys runtime update")
log.Trace().Int("numKeys", len(startupAppConfig.ApiKeys)).Msg("api keys provided at startup")
if len(fileContent) > 0 { if len(fileContent) > 0 {
// Parse JSON content from the file // Parse JSON content from the file
@ -132,11 +135,14 @@ func readApiKeysJson(startupAppConfig config.ApplicationConfig) fileHandler {
return err return err
} }
log.Trace().Int("numKeys", len(fileKeys)).Msg("discovered API keys from api keys dynamic config dile")
appConfig.ApiKeys = append(startupAppConfig.ApiKeys, fileKeys...) appConfig.ApiKeys = append(startupAppConfig.ApiKeys, fileKeys...)
} else { } else {
log.Trace().Msg("no API keys discovered from dynamic config file")
appConfig.ApiKeys = startupAppConfig.ApiKeys appConfig.ApiKeys = startupAppConfig.ApiKeys
} }
log.Debug().Msg("api keys loaded from api_keys.json") log.Trace().Int("numKeys", len(appConfig.ApiKeys)).Msg("total api keys after processing")
return nil return nil
} }