Compare commits

...

3 Commits

Author SHA1 Message Date
tx7do
1f708cdf67 fix: stupid bug. 2023-10-26 18:47:25 +08:00
tx7do
4bf4e02919 fix: stupid bug. 2023-10-26 18:42:42 +08:00
tx7do
78ae649d26 fix: stupid bug. 2023-10-26 18:37:04 +08:00
3 changed files with 23 additions and 16 deletions

View File

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

View File

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

View File

@@ -1,3 +1,3 @@
git tag v0.2.3
git tag v0.2.6
git push origin --tags