Compare commits

..

1 Commits

Author SHA1 Message Date
tx7do
4bf4e02919 fix: stupid bug. 2023-10-26 18:42:42 +08:00
3 changed files with 21 additions and 14 deletions

View File

@@ -1,6 +1,7 @@
package bootstrap package bootstrap
import ( import (
"fmt"
"github.com/go-kratos/kratos/v2/log" "github.com/go-kratos/kratos/v2/log"
"github.com/go-kratos/kratos/v2/registry" "github.com/go-kratos/kratos/v2/registry"
@@ -17,7 +18,7 @@ func Bootstrap(serviceInfo *ServiceInfo) (*conf.Bootstrap, log.Logger, registry.
// load configs // load configs
if err = LoadBootstrapConfig(Flags.Conf); err == nil { if err = LoadBootstrapConfig(Flags.Conf); err == nil {
panic("load config failed") panic(fmt.Sprintf("load config failed: %v", err))
} }
// init logger // init logger
@@ -28,7 +29,7 @@ func Bootstrap(serviceInfo *ServiceInfo) (*conf.Bootstrap, log.Logger, registry.
// init tracer // init tracer
if err = NewTracerProvider(commonConfig.Trace, serviceInfo); err != nil { if err = NewTracerProvider(commonConfig.Trace, serviceInfo); err != nil {
panic(err) panic(fmt.Sprintf("init tracer failed: %v", err))
} }
return commonConfig, ll, reg return commonConfig, ll, reg

View File

@@ -122,18 +122,29 @@ func NewConfigProvider(configPath string) config.Config {
func LoadBootstrapConfig(configPath string) error { func LoadBootstrapConfig(configPath string) error {
cfg := NewConfigProvider(configPath) cfg := NewConfigProvider(configPath)
if err := cfg.Load(); err != nil { var err error
panic(err)
if err = cfg.Load(); err != nil {
return err
} }
initBootstrapConfig() initBootstrapConfig()
if err = scanConfigs(cfg); err != nil {
return err
}
return nil
}
func scanConfigs(cfg config.Config) error {
initBootstrapConfig()
for _, c := range configList { for _, c := range configList {
if err := cfg.Scan(c); err != nil { if err := cfg.Scan(c); err != nil {
return err return err
} }
} }
return nil return nil
} }
@@ -161,8 +172,7 @@ func LoadRemoteConfigSourceConfigs(configPath string) (error, *conf.RemoteConfig
), ),
) )
defer func(cfg config.Config) { defer func(cfg config.Config) {
err := cfg.Close() if err := cfg.Close(); err != nil {
if err != nil {
panic(err) panic(err)
} }
}(cfg) }(cfg)
@@ -173,12 +183,8 @@ func LoadRemoteConfigSourceConfigs(configPath string) (error, *conf.RemoteConfig
return err, nil return err, nil
} }
initBootstrapConfig() if err = scanConfigs(cfg); err != nil {
return err, nil
for _, c := range configList {
if err = cfg.Scan(c); err != nil {
return err, nil
}
} }
return nil, commonConfig.Config return nil, commonConfig.Config

View File

@@ -1,3 +1,3 @@
git tag v0.2.4 git tag v0.2.5
git push origin --tags git push origin --tags