fix(FindNetworkInterfaces): catch exceptions

FindNetworkInterfaces is called by an event handler, so we do not want to bubble up exceptions.
richardschneider · Dec 13, 2018 · 8f7a766 · 8f7a766
1 parent 94e8e96
commit 8f7a766
Showing 1 changed file with 38 additions and 29 deletions.
diff --git a/src/MulticastService.cs b/src/MulticastService.cs
@@ -229,48 +229,57 @@ public void Stop()
 
         void FindNetworkInterfaces()
         {
-            var currentNics = GetNetworkInterfaces().ToList();
+            log.Debug("Finding network interfaces");
 
-            var newNics = new List<NetworkInterface>();
-            var oldNics = new List<NetworkInterface>();
-
-            foreach (var nic in knownNics.Where(k => !currentNics.Any(n => k.Id == n.Id)))
+            try
             {
-                oldNics.Add(nic);
+                var currentNics = GetNetworkInterfaces().ToList();
+
+                var newNics = new List<NetworkInterface>();
+                var oldNics = new List<NetworkInterface>();
 
-                if (log.IsDebugEnabled)
+                foreach (var nic in knownNics.Where(k => !currentNics.Any(n => k.Id == n.Id)))
                 {
-                    log.Debug($"Removed nic '{nic.Name}'.");
-                }
-            }
+                    oldNics.Add(nic);
 
-            foreach (var nic in currentNics.Where(nic => !knownNics.Any(k => k.Id == nic.Id)))
-            {
-                newNics.Add(nic);
+                    if (log.IsDebugEnabled)
+                    {
+                        log.Debug($"Removed nic '{nic.Name}'.");
+                    }
+                }
 
-                if (log.IsDebugEnabled)
+                foreach (var nic in currentNics.Where(nic => !knownNics.Any(k => k.Id == nic.Id)))
                 {
-                    log.Debug($"Found nic '{nic.Name}'.");
+                    newNics.Add(nic);
+
+                    if (log.IsDebugEnabled)
+                    {
+                        log.Debug($"Found nic '{nic.Name}'.");
+                    }
                 }
-            }
 
-            knownNics = currentNics;
+                knownNics = currentNics;
 
-            client?.Dispose();
-            client = new MulticastClient(MdnsEndpoint, networkInterfacesFilter?.Invoke(knownNics) ?? knownNics);
-            client.Receive(OnDnsMessage);
+                client?.Dispose();
+                client = new MulticastClient(MdnsEndpoint, networkInterfacesFilter?.Invoke(knownNics) ?? knownNics);
+                client.Receive(OnDnsMessage);
 
-            // Tell others.
-            if (newNics.Any())
-            {
-                NetworkInterfaceDiscovered?.Invoke(this, new NetworkInterfaceEventArgs
+                // Tell others.
+                if (newNics.Any())
                 {
-                    NetworkInterfaces = newNics
-                });
-            }
+                    NetworkInterfaceDiscovered?.Invoke(this, new NetworkInterfaceEventArgs
+                    {
+                        NetworkInterfaces = newNics
+                    });
+                }
 
-            NetworkChange.NetworkAddressChanged -= OnNetworkAddressChanged;
-            NetworkChange.NetworkAddressChanged += OnNetworkAddressChanged;
+                NetworkChange.NetworkAddressChanged -= OnNetworkAddressChanged;
+                NetworkChange.NetworkAddressChanged += OnNetworkAddressChanged;
+            }
+            catch (Exception e)
+            {
+                log.Error("FindNics failed", e);
+            }
         }
 
         /// <inheritdoc />