From 5ec812681853887082513c1fa3a709592a8696af Mon Sep 17 00:00:00 2001 From: Jack O'Sullivan Date: Fri, 11 Jun 2021 00:38:04 +0100 Subject: [PATCH] Tweak persistent DHCP client --- pkg/plugin/dhcp_manager.go | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkg/plugin/dhcp_manager.go b/pkg/plugin/dhcp_manager.go index fe29daf..70f0446 100644 --- a/pkg/plugin/dhcp_manager.go +++ b/pkg/plugin/dhcp_manager.go @@ -124,6 +124,10 @@ func (m *dhcpManager) setupClient(v6 bool) (chan error, error) { v6Str = "v6" } + log. + WithFields(m.logFields(v6)). + Info("Starting persistent DHCP client") + client, err := udhcpc.NewDHCPClient(m.ctrLink.Attrs().Name, &udhcpc.DHCPClientOptions{ Hostname: m.hostname, V6: v6, @@ -185,9 +189,11 @@ func (m *dhcpManager) setupClient(v6 bool) (chan error, error) { } case <-m.stopChan: - log.WithFields(m.logFields(v6)).Info("Shutting down persistent DHCP client") + log. + WithFields(m.logFields(v6)). + Info("Shutting down persistent DHCP client") - ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second) + ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second) defer cancel() errChan <- client.Finish(ctx)