update
continuous-integration/drone/push Build is passing Details

This commit is contained in:
ayham 2021-08-02 19:23:20 +03:00
parent ff5148df75
commit 7c5ebd00c5
Signed by: ayham
GPG Key ID: EAB7F5A9DF503678
3 changed files with 24 additions and 32 deletions

View File

@ -1,15 +1,15 @@
use log::warn;
use crate::common::account::portfolio::Portfolio;
use crate::common::account::position::Position;
use crate::common::message::inst::DataTransferInst;
use crate::common::message::message::Message;
use crate::common::message::message_builder::message_builder;
use crate::common::message::message_type::MessageType;
use crate::common::message::inst::DataTransferInst;
use crate::common::account::portfolio::Portfolio;
use crate::common::account::position::Position;
use crate::common::misc::assert_msg::assert_msg;
use crate::server::network::jwt_wrapper::verify_jwt_token;
use crate::server::db::initializer::db_connect;
use crate::server::network::jwt_wrapper::verify_jwt_token;
use tokio::io::AsyncWriteExt;
use tokio::net::TcpStream;
@ -50,18 +50,18 @@ pub async fn acc_retrieve_portfolio(
0,
0,
bincode::serialize(&"Password Incorrect").unwrap(),
);
);
match tls_connection
.write_all(&bincode::serialize(&server_response).unwrap())
.await
{
_ => {
// TODO: do we shutdown connection or do we let handle_data caller do it's
// thing
tls_connection.shutdown().await.unwrap();
return Ok(());
}
};
{
_ => {
// TODO: do we shutdown connection or do we let handle_data caller do it's
// thing
tls_connection.shutdown().await.unwrap();
return Ok(());
}
};
}
};
@ -109,12 +109,13 @@ pub async fn acc_retrieve_portfolio(
);
match tls_connection
.write_all(&bincode::serialize(&message).unwrap())
.await {
Ok(()) => Ok(()),
Err(err) => {
// Log issue in writing to client
warn!("Could not write to cient! With Error: {}\nIgnoring...", err);
Ok(())
}
.await
{
Ok(()) => Ok(()),
Err(err) => {
// Log issue in writing to client
warn!("Could not write to cient! With Error: {}\nIgnoring...", err);
Ok(())
}
}
}

View File

@ -14,10 +14,7 @@
/// ```rust
/// let mut client = db_connect(DB_USER, DB_PASS)?;
/// ```
pub async fn db_connect(
user: String,
pass: String,
) -> std::io::Result<tokio_postgres::Client> {
pub async fn db_connect(user: String, pass: String) -> std::io::Result<tokio_postgres::Client> {
/* Generate the requested string */
let db_connect_str = format!(
"host={} port={} dbname={} user={} password={}",
@ -29,13 +26,8 @@ pub async fn db_connect(
);
let (client, connection) =
tokio_postgres::connect(db_connect_str.as_str(), tokio_postgres::NoTls)
.await
.map_err(|err| {
std::io::Error::new(
std::io::ErrorKind::Other,
format!("{}", err)
)
})?;
.await
.map_err(|err| std::io::Error::new(std::io::ErrorKind::Other, format!("{}", err)))?;
tokio::spawn(async move {
if let Err(e) = connection.await {
eprintln!("SQL connection error: {}", e);

View File

@ -11,7 +11,6 @@ use crate::server::account::retrieval_portfolio::acc_retrieve_portfolio;
use crate::server::network::cmd::retrieve_transactions::retrieve_transactions;
//use tokio::net::TcpStream;
use tokio::io::AsyncWriteExt;
use tokio::net::TcpStream;
use tokio_rustls::server::TlsStream;