From 4bf4e02919ab820676aca957c5f1df64a05c785a Mon Sep 17 00:00:00 2001
From: tx7do <yanglinbo@gmail.com>
Date: Thu, 26 Oct 2023 18:42:42 +0800
Subject: [PATCH] fix: stupid bug.

---
 bootstrap.go |  5 +++--
 config.go    | 28 +++++++++++++++++-----------
 tag.bat      |  2 +-
 3 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/bootstrap.go b/bootstrap.go
index ae834cd..7c45387 100644
--- a/bootstrap.go
+++ b/bootstrap.go
@@ -1,6 +1,7 @@
 package bootstrap
 
 import (
+	"fmt"
 	"github.com/go-kratos/kratos/v2/log"
 	"github.com/go-kratos/kratos/v2/registry"
 
@@ -17,7 +18,7 @@ func Bootstrap(serviceInfo *ServiceInfo) (*conf.Bootstrap, log.Logger, registry.
 
 	// load configs
 	if err = LoadBootstrapConfig(Flags.Conf); err == nil {
-		panic("load config failed")
+		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
diff --git a/config.go b/config.go
index cea54b9..e0a8c73 100644
--- a/config.go
+++ b/config.go
@@ -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()
 
+	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
diff --git a/tag.bat b/tag.bat
index 3ee41dc..10072e5 100644
--- a/tag.bat
+++ b/tag.bat
@@ -1,3 +1,3 @@
-git tag v0.2.4
+git tag v0.2.5
 
 git push origin --tags
\ No newline at end of file