Skip to content

Commit 2a08336

Browse files
cursoragentlovasoa
andcommitted
Remove redundant debug logs from SSRP connection logic
Co-authored-by: contact <[email protected]>
1 parent 6179f09 commit 2a08336

File tree

1 file changed

+1
-42
lines changed
  • sqlx-core/src/mssql/connection

1 file changed

+1
-42
lines changed

sqlx-core/src/mssql/connection/ssrp.rs

Lines changed: 1 addition & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ pub(crate) async fn resolve_instance_port(server: &str, instance: &str) -> Resul
2121
request.push(0);
2222

2323
let socket = UdpSocket::bind("0.0.0.0:0").await.map_err(|e| {
24-
log::debug!("failed to bind UDP socket for SSRP: {}", e);
2524
err_protocol!("failed to bind UDP socket for SSRP: {}", e)
2625
})?;
2726

@@ -36,20 +35,13 @@ pub(crate) async fn resolve_instance_port(server: &str, instance: &str) -> Resul
3635
.send_to(&request, (server, SSRP_PORT))
3736
.await
3837
.map_err(|e| {
39-
log::debug!("failed to send SSRP request to {}:{}: {}", server, SSRP_PORT, e);
4038
err_protocol!("failed to send SSRP request to {}:{}: {}", server, SSRP_PORT, e)
4139
})?;
4240

4341
let mut buffer = [0u8; 1024];
4442
let bytes_read = timeout(SSRP_TIMEOUT, socket.recv(&mut buffer))
4543
.await
4644
.map_err(|_| {
47-
log::debug!(
48-
"SSRP request to {} for instance {} timed out after {:?}",
49-
server,
50-
instance,
51-
SSRP_TIMEOUT
52-
);
5345
err_protocol!(
5446
"SSRP request to {} for instance {} timed out after {:?}",
5547
server,
@@ -58,12 +50,6 @@ pub(crate) async fn resolve_instance_port(server: &str, instance: &str) -> Resul
5850
)
5951
})?
6052
.map_err(|e| {
61-
log::debug!(
62-
"failed to receive SSRP response from {} for instance {}: {}",
63-
server,
64-
instance,
65-
e
66-
);
6753
err_protocol!(
6854
"failed to receive SSRP response from {} for instance {}: {}",
6955
server,
@@ -79,18 +65,13 @@ pub(crate) async fn resolve_instance_port(server: &str, instance: &str) -> Resul
7965
);
8066

8167
if bytes_read < 3 {
82-
log::debug!("SSRP response too short: {} bytes", bytes_read);
8368
return Err(err_protocol!(
8469
"SSRP response too short: {} bytes",
8570
bytes_read
8671
));
8772
}
8873

8974
if buffer[0] != SVR_RESP {
90-
log::debug!(
91-
"invalid SSRP response type: expected 0x05, got 0x{:02x}",
92-
buffer[0]
93-
);
9475
return Err(err_protocol!(
9576
"invalid SSRP response type: expected 0x05, got 0x{:02x}",
9677
buffer[0]
@@ -99,11 +80,6 @@ pub(crate) async fn resolve_instance_port(server: &str, instance: &str) -> Resul
9980

10081
let response_size = u16::from_le_bytes([buffer[1], buffer[2]]) as usize;
10182
if response_size + 3 > bytes_read {
102-
log::debug!(
103-
"SSRP response size mismatch: expected {} bytes, got {}",
104-
response_size + 3,
105-
bytes_read
106-
);
10783
return Err(err_protocol!(
10884
"SSRP response size mismatch: expected {} bytes, got {}",
10985
response_size + 3,
@@ -112,10 +88,7 @@ pub(crate) async fn resolve_instance_port(server: &str, instance: &str) -> Resul
11288
}
11389

11490
let response_data = String::from_utf8(buffer[3..(3 + response_size)].to_vec())
115-
.map_err(|e| {
116-
log::debug!("SSRP response is not valid UTF-8: {}", e);
117-
err_protocol!("SSRP response is not valid UTF-8: {}", e)
118-
})?;
91+
.map_err(|e| err_protocol!("SSRP response is not valid UTF-8: {}", e))?;
11992

12093
log::debug!("SSRP response data: {}", response_data);
12194

@@ -157,11 +130,6 @@ fn parse_ssrp_response(data: &str, instance_name: &str) -> Result<u16, Error> {
157130

158131
if let Some(tcp_port_str) = properties.get("tcp") {
159132
let port = tcp_port_str.parse::<u16>().map_err(|e| {
160-
log::debug!(
161-
"invalid TCP port '{}' in SSRP response: {}",
162-
tcp_port_str,
163-
e
164-
);
165133
err_protocol!(
166134
"invalid TCP port '{}' in SSRP response: {}",
167135
tcp_port_str,
@@ -177,11 +145,6 @@ fn parse_ssrp_response(data: &str, instance_name: &str) -> Result<u16, Error> {
177145

178146
return Ok(port);
179147
} else {
180-
log::debug!(
181-
"instance '{}' found but no TCP port available in properties: {:?}",
182-
instance_name,
183-
properties.keys().collect::<Vec<_>>()
184-
);
185148
return Err(err_protocol!(
186149
"instance '{}' found but no TCP port available",
187150
instance_name
@@ -191,10 +154,6 @@ fn parse_ssrp_response(data: &str, instance_name: &str) -> Result<u16, Error> {
191154
}
192155
}
193156

194-
log::debug!(
195-
"instance '{}' not found in SSRP response",
196-
instance_name
197-
);
198157
Err(err_protocol!(
199158
"instance '{}' not found in SSRP response",
200159
instance_name

0 commit comments

Comments
 (0)