mirror/osrg-gobgp
1
0
Fork 0
mirror of https://github.com/osrg/gobgp.git synced 2024-05-11 05:55:10 +00:00
Code Issues Releases Activity

Split creation of config reading channel

Browse Source
This commit is contained in:
Carl Baldwin
2019-08-28 09:06:20 +09:00
committed by FUJITA Tomonori
parent f9b1f86a0a
commit ed1aef36e7
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/gobgpd/main.go
+7 -3
View File
@@ -122,8 +122,8 @@ func main() {
log.SetFormatter(&log.JSONFormatter{})
}
configCh := make(chan *internal_cfg.BgpConfigSet)
if opts.Dry {
configCh := make(chan *internal_cfg.BgpConfigSet)
go internal_cfg.ReadConfigfileServe(opts.ConfigFile, opts.ConfigType, configCh)
c := <-configCh
if opts.LogLevel == "debug" {
@@ -156,10 +156,14 @@ func main() {
}
}
if opts.ConfigFile != "" {
go internal_cfg.ReadConfigfileServe(opts.ConfigFile, opts.ConfigType, configCh)
if opts.ConfigFile == "" {
<-sigCh
stopServer(bgpServer, opts.UseSdNotify)
return
}
configCh := make(chan *internal_cfg.BgpConfigSet)
go internal_cfg.ReadConfigfileServe(opts.ConfigFile, opts.ConfigType, configCh)
loop := func() {
initialConfig := <-configCh
c := config.ApplyInitialConfig(bgpServer, initialConfig, opts.GracefulRestart)