summaryrefslogtreecommitdiffhomepage
path: root/mullvad-relay-selector
diff options
context:
space:
mode:
authorDavid Lönnhager <david.l@mullvad.net>2023-08-10 18:37:17 +0200
committerDavid Lönnhager <david.l@mullvad.net>2023-08-21 16:39:49 +0200
commit58fc8498458003f50e34d4f19296a3d9e014d10d (patch)
tree6ce124dadf47c816de01a9d6da97f6748f9c3479 /mullvad-relay-selector
parentf547247627593aa45f0f67b7bb19c83168cd125d (diff)
downloadmullvadvpn-58fc8498458003f50e34d4f19296a3d9e014d10d.tar.xz
mullvadvpn-58fc8498458003f50e34d4f19296a3d9e014d10d.zip
Implement formatter for constraints
Diffstat (limited to 'mullvad-relay-selector')
-rw-r--r--mullvad-relay-selector/src/lib.rs14
1 files changed, 9 insertions, 5 deletions
diff --git a/mullvad-relay-selector/src/lib.rs b/mullvad-relay-selector/src/lib.rs
index 843797c853..4baee72d04 100644
--- a/mullvad-relay-selector/src/lib.rs
+++ b/mullvad-relay-selector/src/lib.rs
@@ -10,8 +10,8 @@ use mullvad_types::{
relay_constraints::{
BridgeSettings, BridgeState, Constraint, InternalBridgeConstraints, LocationConstraint,
Match, ObfuscationSettings, OpenVpnConstraints, Ownership, Providers, RelayConstraints,
- RelaySettings, ResolvedLocationConstraint, SelectedObfuscation, Set, TransportPort,
- Udp2TcpObfuscationSettings,
+ RelayConstraintsFormatter, RelaySettings, ResolvedLocationConstraint, SelectedObfuscation,
+ Set, TransportPort, Udp2TcpObfuscationSettings,
},
relay_list::{BridgeEndpointData, Relay, RelayEndpointData, RelayList},
CustomTunnelEndpoint,
@@ -651,9 +651,13 @@ impl RelaySelector {
);
Ok(result)
} else {
- let mut relay_constraints_string = String::new();
- let _ = relay_constraints.format(&mut relay_constraints_string, custom_lists);
- log::warn!("No relays matching {}", &relay_constraints_string);
+ log::warn!(
+ "No relays matching constraints: {}",
+ RelayConstraintsFormatter {
+ constraints: relay_constraints,
+ custom_lists,
+ }
+ );
Err(Error::NoRelay)
}
}