Skip to content

Log error messages for network failures #289

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jan 19, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 24 additions & 12 deletions src/messages.rs
Original file line number Diff line number Diff line change
Expand Up @@ -136,9 +136,10 @@ pub async fn startup(stream: &mut TcpStream, user: &str, database: &str) -> Resu

match stream.write_all(&startup).await {
Ok(_) => Ok(()),
Err(_) => {
Err(err) => {
return Err(Error::SocketError(format!(
"Error writing startup to server socket"
"Error writing startup to server socket - Error: {:?}",
err
)))
}
}
Expand Down Expand Up @@ -454,7 +455,12 @@ where
{
match stream.write_all(&buf).await {
Ok(_) => Ok(()),
Err(_) => return Err(Error::SocketError(format!("Error writing to socket"))),
Err(err) => {
return Err(Error::SocketError(format!(
"Error writing to socket - Error: {:?}",
err
)))
}
}
}

Expand All @@ -465,7 +471,12 @@ where
{
match stream.write_all(buf).await {
Ok(_) => Ok(()),
Err(_) => return Err(Error::SocketError(format!("Error writing to socket"))),
Err(err) => {
return Err(Error::SocketError(format!(
"Error writing to socket - Error: {:?}",
err
)))
}
}
}

Expand All @@ -476,19 +487,20 @@ where
{
let code = match stream.read_u8().await {
Ok(code) => code,
Err(_) => {
Err(err) => {
return Err(Error::SocketError(format!(
"Error reading message code from socket"
"Error reading message code from socket - Error {:?}",
err
)))
}
};

let len = match stream.read_i32().await {
Ok(len) => len,
Err(_) => {
Err(err) => {
return Err(Error::SocketError(format!(
"Error reading message len from socket, code: {:?}",
code
"Error reading message len from socket - Code: {:?}, Error: {:?}",
code, err
)))
}
};
Expand All @@ -509,10 +521,10 @@ where
.await
{
Ok(_) => (),
Err(_) => {
Err(err) => {
return Err(Error::SocketError(format!(
"Error reading message from socket, code: {:?}",
code
"Error reading message from socket - Code: {:?}, Error: {:?}",
code, err
)))
}
};
Expand Down
2 changes: 1 addition & 1 deletion tests/ruby/load_balancing_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
threads = Array.new(slow_query_count) do
Thread.new do
conn = PG.connect(processes.pgcat.connection_string("sharded_db", "sharding_user"))
conn.async_exec("SELECT pg_sleep(1)")
conn.async_exec("BEGIN")
end
end

Expand Down