fix: load uid key from manager config
This commit is contained in:
+11
-3
@@ -494,6 +494,17 @@ func main() {
|
||||
logs.Info.Printf("Profiling info saved to '%s.(cpu|mem)'", *pprofFile)
|
||||
}
|
||||
|
||||
adminInternalClient, err := initAdminInternalAPI(config.AdminAPI)
|
||||
if err != nil {
|
||||
logs.Err.Fatal("Failed to initialize Admin internal API client:", err)
|
||||
}
|
||||
if storeConfig, ok, err := storeConfigWithAdminUIDKey(config.Store, adminInternalClient); err != nil {
|
||||
logs.Warn.Printf("Failed to load UID key from Admin internal config, falling back to store_config.uid_key: %v", err)
|
||||
} else if ok {
|
||||
config.Store = storeConfig
|
||||
logs.Info.Println("Loaded store UID key from Admin internal config")
|
||||
}
|
||||
|
||||
err = store.Store.Open(workerId, config.Store)
|
||||
logs.Info.Println("DB adapter", store.Store.GetAdapterName(), store.Store.GetAdapterVersion())
|
||||
if err != nil {
|
||||
@@ -513,9 +524,6 @@ func main() {
|
||||
if err = initInternalAPI(config.Internal); err != nil {
|
||||
logs.Err.Fatal("Failed to initialize internal API:", err)
|
||||
}
|
||||
if err = initAdminInternalAPI(config.AdminAPI); err != nil {
|
||||
logs.Err.Fatal("Failed to initialize Admin internal API client:", err)
|
||||
}
|
||||
|
||||
// API key signing secret
|
||||
globals.apiKeySalt = config.APIKeySalt
|
||||
|
||||
Reference in New Issue
Block a user