mirror of
https://github.com/neondatabase/neon.git
synced 2026-05-21 23:20:40 +00:00
fdde58120c
This upgrades the `proxy/` crate as well as the forked libraries in `libs/proxy/` to edition 2024. Also reformats the imports of those forked libraries via: ``` cargo +nightly fmt -p proxy -p postgres-protocol2 -p postgres-types2 -p tokio-postgres2 -- -l --config imports_granularity=Module,group_imports=StdExternalCrate,reorder_imports=true ``` It can be read commit-by-commit: the first commit has no formatting changes, only changes to accomodate the new edition. Part of #10918
42 lines
1.0 KiB
Rust
42 lines
1.0 KiB
Rust
use std::io;
|
|
|
|
use tokio::net::TcpStream;
|
|
|
|
use crate::client::SocketConfig;
|
|
use crate::config::{Host, SslMode};
|
|
use crate::tls::MakeTlsConnect;
|
|
use crate::{Error, cancel_query_raw, connect_socket};
|
|
|
|
pub(crate) async fn cancel_query<T>(
|
|
config: Option<SocketConfig>,
|
|
ssl_mode: SslMode,
|
|
mut tls: T,
|
|
process_id: i32,
|
|
secret_key: i32,
|
|
) -> Result<(), Error>
|
|
where
|
|
T: MakeTlsConnect<TcpStream>,
|
|
{
|
|
let config = match config {
|
|
Some(config) => config,
|
|
None => {
|
|
return Err(Error::connect(io::Error::new(
|
|
io::ErrorKind::InvalidInput,
|
|
"unknown host",
|
|
)));
|
|
}
|
|
};
|
|
|
|
let hostname = match &config.host {
|
|
Host::Tcp(host) => &**host,
|
|
};
|
|
let tls = tls
|
|
.make_tls_connect(hostname)
|
|
.map_err(|e| Error::tls(e.into()))?;
|
|
|
|
let socket =
|
|
connect_socket::connect_socket(&config.host, config.port, config.connect_timeout).await?;
|
|
|
|
cancel_query_raw::cancel_query_raw(socket, ssl_mode, tls, process_id, secret_key).await
|
|
}
|