mirror of
https://hubproxy.babadafafafafa.cn/https://github.com/kube-vip/kube-vip.git
synced 2026-09-20 08:03:47 +08:00
Moves logging level back to the global setting
Signed-off-by: Dan Finneran <dan@thebsdbox.co.uk>
This commit is contained in:
@@ -24,7 +24,7 @@ type Server struct {
|
||||
}
|
||||
|
||||
// NewBGPServer takes a configuration and returns a running BGP server instance
|
||||
func NewBGPServer(c kubevip.BGPConfig) (b *Server, err error) {
|
||||
func NewBGPServer(c kubevip.BGPConfig, logLevel log.Level) (b *Server, err error) {
|
||||
if c.AS == 0 {
|
||||
return nil, fmt.Errorf("you need to provide AS")
|
||||
}
|
||||
@@ -38,7 +38,7 @@ func NewBGPServer(c kubevip.BGPConfig) (b *Server, err error) {
|
||||
}
|
||||
bgpLogger := log.Default()
|
||||
lvl := &log.LevelVar{}
|
||||
lvl.Set(log.LevelInfo)
|
||||
lvl.Set(logLevel)
|
||||
|
||||
b = &Server{
|
||||
s: gobgp.NewBgpServer(gobgp.LoggerOption(bgpLogger, lvl)),
|
||||
|
||||
@@ -227,8 +227,7 @@ func New(ctx context.Context, configMap string, config *kubevip.Config) (*Manage
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
bgpServer, err = bgp.NewBGPServer(config.BGPConfig)
|
||||
bgpServer, err = bgp.NewBGPServer(config.BGPConfig, log.Level(config.Logging))
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("creating BGP server: %w", err)
|
||||
}
|
||||
|
||||
@@ -45,7 +45,7 @@ func NewBGP(arpMgr *arp.Manager, intfMgr *networkinterface.Manager,
|
||||
func (b *BGP) Configure(ctx context.Context, _ *sync.WaitGroup) error {
|
||||
var err error
|
||||
if b.bgpServer == nil {
|
||||
b.bgpServer, err = bgp.NewBGPServer(b.config.BGPConfig)
|
||||
b.bgpServer, err = bgp.NewBGPServer(b.config.BGPConfig, log.Level(b.config.Logging))
|
||||
if err != nil {
|
||||
return fmt.Errorf("creating BGP server: %w", err)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user