Skip to content

Commit 7378aa2

Browse files
committed
Merge remote-tracking branch 'origin/macos-remove-excess-logging'
2 parents 5ac1f89 + 710ae86 commit 7378aa2

File tree

1 file changed

+2
-9
lines changed

1 file changed

+2
-9
lines changed

talpid-routing/src/unix/macos/interface.rs

+2-9
Original file line numberDiff line numberDiff line change
@@ -133,10 +133,7 @@ impl PrimaryInterfaceMonitor {
133133
log::debug!("Found primary interface for {family}");
134134
vec![iface]
135135
})
136-
.unwrap_or_else(|| {
137-
log::debug!("No primary interface for {family}. Checking service order");
138-
self.network_services(family)
139-
});
136+
.unwrap_or_else(|| self.network_services(family));
140137

141138
let (iface, index) = ifaces
142139
.into_iter()
@@ -225,11 +222,7 @@ impl PrimaryInterfaceMonitor {
225222
let ip_dict = self
226223
.store
227224
.get(CFString::new(&key))
228-
.and_then(|v| v.downcast_into::<CFDictionary>())
229-
.or_else(|| {
230-
log::debug!("No {family} dict for {service_id_s}");
231-
None
232-
})?;
225+
.and_then(|v| v.downcast_into::<CFDictionary>())?;
233226
let name = ip_dict
234227
.find(unsafe { kSCPropInterfaceName }.to_void())
235228
.map(|s| unsafe { CFType::wrap_under_get_rule(*s) })

0 commit comments

Comments
 (0)