LumeWeb
/
portal
1
0
Fork 0
Code Issues 5 Pull Requests Packages Projects Releases Wiki Activity

fix: update config management in init functions

This commit is contained in:
Derrick Hammer 2024-02-22 03:39:29 -05:00
parent ef25887a87
commit 856b7fb627
Signed by: pcfreak30
GPG Key ID: C997C339BE476FF2
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
cmd/portal/init.go
View File

@ -7,14 +7,15 @@ import (
"net/http" "net/http"
"strconv" "strconv"
"git.lumeweb.com/LumeWeb/portal/config"
"git.lumeweb.com/LumeWeb/portal/api/registry" "git.lumeweb.com/LumeWeb/portal/api/registry"
"github.com/spf13/viper"
"go.sia.tech/core/wallet" "go.sia.tech/core/wallet"
"go.uber.org/fx" "go.uber.org/fx"
"go.uber.org/zap" "go.uber.org/zap"
) )
func initCheckRequiredConfig(logger *zap.Logger, config *viper.Viper) error { func initCheckRequiredConfig(logger *zap.Logger, config *config.Manager) error {
required := []string{ required := []string{
"core.domain", "core.domain",
"core.port", "core.port",
@ -24,7 +25,7 @@ func initCheckRequiredConfig(logger *zap.Logger, config *viper.Viper) error {
"core.db.password", "core.db.password",
"core.db.host", "core.db.host",
"core.db.name", "core.db.name",
"core.storage.s3.bufferBucket", "core.storage.s3.buffer_bucket",
"core.storage.s3.endpoint", "core.storage.s3.endpoint",
"core.storage.s3.region", "core.storage.s3.region",
"core.storage.s3.accessKey", "core.storage.s3.accessKey",
@ -32,7 +33,7 @@ func initCheckRequiredConfig(logger *zap.Logger, config *viper.Viper) error {
} }
for _, key := range required { for _, key := range required {
if !config.IsSet(key) { if !config.Viper().IsSet(key) {
logger.Fatal(key + " is required") logger.Fatal(key + " is required")
} }
} }
@ -40,15 +41,15 @@ func initCheckRequiredConfig(logger *zap.Logger, config *viper.Viper) error {
return nil return nil
} }
func NewIdentity(config *viper.Viper, logger *zap.Logger) (ed25519.PrivateKey, error) { func NewIdentity(config *config.Manager, logger *zap.Logger) (ed25519.PrivateKey, error) {
var seed [32]byte var seed [32]byte
identitySeed := config.GetString("core.identity") identitySeed := config.Config().Core.Identity
if identitySeed == "" { if identitySeed == "" {
logger.Info("Generating new identity seed") logger.Info("Generating new identity seed")
identitySeed = wallet.NewSeedPhrase() identitySeed = wallet.NewSeedPhrase()
config.Set("core.identity", identitySeed) config.Viper().Set("core.identity", identitySeed)
err := config.WriteConfig() err := config.Save()
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -61,10 +62,10 @@ func NewIdentity(config *viper.Viper, logger *zap.Logger) (ed25519.PrivateKey, e
return ed25519.PrivateKey(wallet.KeyFromSeed(&seed, 0)), nil return ed25519.PrivateKey(wallet.KeyFromSeed(&seed, 0)), nil
} }
func NewServer(lc fx.Lifecycle, config *viper.Viper, logger *zap.Logger) (*http.Server, error) { func NewServer(lc fx.Lifecycle, config *config.Manager, logger *zap.Logger) (*http.Server, error) {
srv := &http.Server{ srv := &http.Server{
Addr: ":" + strconv.FormatUint(uint64(config.GetUint("core.port")), 10), Addr: ":" + strconv.FormatUint(uint64(config.Config().Core.Port), 10),
Handler: registry.GetRouter(), Handler: registry.GetRouter(),
} }