Switch away from channel for one-off dry run

2 files changed, 14 insertions, 3 deletions

diff --git a/cmd/gobgpd/main.go b/cmd/gobgpd/main.go
index 68ea0cac..5834a406 100644
--- a/cmd/gobgpd/main.go
+++ b/cmd/gobgpd/main.go
@@ -123,9 +123,16 @@ func main() {
 	}
 
 	if opts.Dry {
-		configCh := make(chan *internal_cfg.BgpConfigSet)
-		go internal_cfg.ReadConfigfileServe(opts.ConfigFile, opts.ConfigType, configCh)
-		c := <-configCh
+		c, err := config.ReadConfigFile(opts.ConfigFile, opts.ConfigType)
+		if err != nil {
+			log.WithFields(log.Fields{
+				"Topic": "Config",
+				"Error": err,
+			}).Fatalf("Can't read config file %s", opts.ConfigFile)
+		}
+		log.WithFields(log.Fields{
+			"Topic": "Config",
+		}).Info("Finished reading the config file")
 		if opts.LogLevel == "debug" {
 			pretty.Println(c)
 		}
diff --git a/pkg/config/config.go b/pkg/config/config.go
index 4a4394df..b369760b 100644
--- a/pkg/config/config.go
+++ b/pkg/config/config.go
@@ -13,6 +13,10 @@ import (
 	"github.com/osrg/gobgp/pkg/server"
 )
 
+func ReadConfigFile(configFile, configType string) (*config.BgpConfigSet, error) {
+	return config.ReadConfigfile(configFile, configType)
+}
+
 func marshalRouteTargets(l []string) ([]*any.Any, error) {
 	rtList := make([]*any.Any, 0, len(l))
 	for _, rtString := range l {