Check status recorder for nil

netbirdio · Jan 22, 2025 · c7e9566 · c7e9566
1 parent b50daa0
commit c7e9566
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/client/internal/dns/upstream.go b/client/internal/dns/upstream.go
@@ -172,6 +172,10 @@ func (u *upstreamResolverBase) checkUpstreamFails(err error) {
 
 	u.disable(err)
 
+	if u.statusRecorder == nil {
+		return
+	}
+
 	u.statusRecorder.PublishEvent(
 		proto.SystemEvent_WARNING,
 		proto.SystemEvent_DNS,
@@ -229,6 +233,10 @@ func (u *upstreamResolverBase) probeAvailability() {
 	if !success {
 		u.disable(errors.ErrorOrNil())
 
+		if u.statusRecorder == nil {
+			return
+		}
+
 		u.statusRecorder.PublishEvent(
 			proto.SystemEvent_WARNING,
 			proto.SystemEvent_DNS,

diff --git a/client/server/network.go b/client/server/network.go
@@ -184,8 +184,8 @@ func (s *Server) DeselectNetworks(_ context.Context, req *proto.SelectNetworksRe
 		"",
 		map[string]string{
 			"networks": strings.Join(req.GetNetworkIDs(), ", "),
-			"all":      fmt.Sprint(req.GetAll()),
 			"append":   fmt.Sprint(req.GetAppend()),
+			"all":      fmt.Sprint(req.GetAll()),
 		},
 	)