[lxc-devel] [lxd/master] lxd/network: Log failures to reload

stgraber on Github lxc-bot at linuxcontainers.org
Tue May 14 20:58:39 UTC 2019


A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 354 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20190514/da94229e/attachment.bin>
-------------- next part --------------
From 5b3ef6a04a1d2ebea7d354bbef08a8a5c44f39ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Tue, 14 May 2019 22:58:10 +0200
Subject: [PATCH] lxd/network: Log failures to reload
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
---
 lxd/networks_utils.go | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lxd/networks_utils.go b/lxd/networks_utils.go
index 81c76be876..277151802d 100644
--- a/lxd/networks_utils.go
+++ b/lxd/networks_utils.go
@@ -1081,7 +1081,12 @@ func networkClearLease(s *state.State, name string, network string, hwaddr strin
 	if err != nil {
 		return err
 	}
-	defer n.Start()
+	defer func() {
+		err := n.Start()
+		if err != nil {
+			logger.Errorf("Failed to reload network '%s': %v", network, err)
+		}
+	}()
 
 	// Stop dnsmasq
 	err = networkKillDnsmasq(network, false)


More information about the lxc-devel mailing list