rust/neon
1
0
Fork 0
mirror of https://github.com/neondatabase/neon.git synced 2026-01-17 10:22:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

now borrow checking problems

Browse Source
This commit is contained in:
Stas Kelvich
2023-04-26 13:58:10 +03:00
parent be0238db3d
commit bba82fa73f
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
proxy/Cargo.toml
View File

@@ -53,6 +53,7 @@ sync_wrapper.workspace = true
thiserror.workspace = true
tls-listener.workspace = true
tokio-postgres.workspace = true
tokio-postgres-rustls.workspace = true
tokio-rustls.workspace = true
tokio = { workspace = true, features = ["signal"] }
tracing-opentelemetry.workspace = true
@@ -71,4 +72,3 @@ tokio-util.workspace = true
[dev-dependencies]
rcgen.workspace = true
rstest.workspace = true
tokio-postgres-rustls.workspace = true

11
proxy/src/compute.rs
View File

@@ -2,7 +2,6 @@ use crate::{cancellation::CancelClosure, error::UserFacingError};
use futures::TryFutureExt;
use itertools::Itertools;
use pq_proto::StartupMessageParams;
use tokio_postgres_rustls::MakeRustlsConnect;
use std::{io, net::SocketAddr};
use thiserror::Error;
use tokio::net::TcpStream;
@@ -200,11 +199,15 @@ pub struct PostgresConnection {
impl ConnCfg {
async fn do_connect(&self) -> Result<PostgresConnection, ConnectionError> {
let a = native_tls::TlsConnector::new().unwrap();
let mut mk: postgres_native_tls::MakeTlsConnector = postgres_native_tls::MakeTlsConnector::new(a);
let tls: postgres_native_tls::TlsConnector = MakeTlsConnect::<tokio::net::TcpStream>::make_tls_connect(&mut mk, "asdf")?;
// TODO: establish a secure connection to the DB.
let (socket_addr, mut stream) = self.connect_raw().await?;
let a = native_tls::TlsConnector::new().unwrap();
let mut mk = postgres_native_tls::MakeTlsConnector::new(a);
let tls = mk.make_tls_connect("asdf")?;
let (client, connection) = self.0.connect_raw(&mut stream, tls).await?;
info!("connected to compute node at {socket_addr}");