Raven/osirose-new
SHA256
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects 6 Releases Wiki Activity

- chore: ran cargo fix on the codebase

Browse Source
This commit is contained in:
raven
2025-03-07 21:03:15 -05:00
parent 3b789d0fd4
commit b6f2d3f456
59 changed files with 1324 additions and 523 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
session-service/src/main.rs
View File

@@ -1,19 +1,17 @@
mod session_service;
use crate::api::session_service_server::SessionServiceServer;
use crate::session_service::SessionServiceImpl;
use dotenv::dotenv;
use std::collections::HashMap;
use std::env;
use std::str::FromStr;
use std::sync::Arc;
use tokio::{select, signal};
use tokio::sync::Mutex;
use tonic::transport::Server;
use tracing::{info, Level};
use tracing::Level;
use utils::consul_registration;
use utils::redis_cache::RedisCache;
use utils::service_discovery::get_service_address;
use crate::api::session_service_server::SessionServiceServer;
use crate::session_service::SessionServiceImpl;
pub mod common {
tonic::include_proto!("common");
@@ -27,18 +25,23 @@ pub mod api {
async fn main() -> Result<(), Box<dyn std::error::Error>> {
dotenv().ok();
tracing_subscriber::fmt()
.with_max_level(Level::from_str(&env::var("LOG_LEVEL").unwrap_or_else(|_| "info".to_string())).unwrap_or_else(|_| Level::INFO))
.with_max_level(
Level::from_str(&env::var("LOG_LEVEL").unwrap_or_else(|_| "info".to_string()))
.unwrap_or_else(|_| Level::INFO),
)
.init();
// Set the gRPC server address
let addr = env::var("LISTEN_ADDR").unwrap_or_else(|_| "0.0.0.0".to_string());
let port = env::var("SESSION_SERVICE_PORT").unwrap_or_else(|_| "50055".to_string());
let health_port = env::var("HEALTH_CHECK_PORT").unwrap_or_else(|_| "8084".to_string());
let redis_url = std::env::var("REDIS_URL").unwrap_or_else(|_| "redis://127.0.0.1:6379".to_string());
let redis_url =
std::env::var("REDIS_URL").unwrap_or_else(|_| "redis://127.0.0.1:6379".to_string());
let consul_url = env::var("CONSUL_URL").unwrap_or_else(|_| "http://127.0.0.1:8500".to_string());
let service_name = env::var("SERVICE_NAME").unwrap_or_else(|_| "session-service".to_string());
let service_address = env::var("SESSION_SERVICE_ADDR").unwrap_or_else(|_| "127.0.0.1".to_string());
let service_address =
env::var("SESSION_SERVICE_ADDR").unwrap_or_else(|_| "127.0.0.1".to_string());
let service_port = port.clone();
let health_check_url = format!("http://{}:{}/health", service_address, health_port);
@@ -57,7 +60,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
meta,
&health_check_url,
)
.await?;
.await?;
// Start health-check endpoint
consul_registration::start_health_check(addr.as_str()).await?;
@@ -65,16 +68,18 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
let full_addr = format!("{}:{}", &addr, port);
let address = full_addr.parse().expect("Invalid address");
let redis_cache = Arc::new(Mutex::new(RedisCache::new(&redis_url)));
let session_service = SessionServiceImpl {
redis: redis_cache
};
let session_service = SessionServiceImpl { redis: redis_cache };
tokio::spawn(Server::builder()
.add_service(SessionServiceServer::new(session_service))
.serve(address));
tokio::spawn(
Server::builder()
.add_service(SessionServiceServer::new(session_service))
.serve(address),
);
utils::signal_handler::wait_for_signal().await;
consul_registration::deregister_service(&consul_url, service_id.as_str()).await.expect("");
consul_registration::deregister_service(&consul_url, service_id.as_str())
.await
.expect("");
Ok(())
}

39
session-service/src/session_service.rs
View File

@@ -1,12 +1,10 @@
use crate::api::session_service_server::SessionService;
use crate::api::{CreateSessionRequest, DeleteSessionRequest, GetSessionRequest, SessionResponse};
use crate::common::Empty;
use serde::{Deserialize, Serialize};
use std::sync::Arc;
use tokio::sync::Mutex;
use tonic::{Request, Response, Status};
use serde::{Serialize, Deserialize};
use crate::api::{
CreateSessionRequest, SessionResponse, GetSessionRequest, DeleteSessionRequest,
};
use crate::common::{Empty};
use crate::api::session_service_server::SessionService;
use utils::redis_cache::{Cache, RedisCache};
#[derive(Serialize, Deserialize, Debug)]
@@ -39,10 +37,13 @@ impl SessionService for SessionServiceImpl {
};
let session_id = req.session_id;
let session_data = serde_json::to_string(&session).map_err(|_| Status::internal("Failed to serialize session"))?;
let session_data = serde_json::to_string(&session)
.map_err(|_| Status::internal("Failed to serialize session"))?;
let conn = self.redis.lock().await;
conn.set(&session_id.clone(), &session_data, 300).await.map_err(|_| Status::internal("Failed to store session in Redis"))?;
conn.set(&session_id.clone(), &session_data, 300)
.await
.map_err(|_| Status::internal("Failed to store session in Redis"))?;
let response = SessionResponse {
session_id,
@@ -63,8 +64,13 @@ impl SessionService for SessionServiceImpl {
let req = request.into_inner();
let conn = self.redis.lock().await;
if let Some(session_data) = conn.get::<String>(&req.session_id).await.map_err(|_| Status::internal("Failed to fetch session from Redis"))? {
let session: Session = serde_json::from_str(&session_data).map_err(|_| Status::internal("Failed to deserialize session"))?;
if let Some(session_data) = conn
.get::<String>(&req.session_id)
.await
.map_err(|_| Status::internal("Failed to fetch session from Redis"))?
{
let session: Session = serde_json::from_str(&session_data)
.map_err(|_| Status::internal("Failed to deserialize session"))?;
let response = SessionResponse {
session_id: req.session_id,
@@ -88,7 +94,9 @@ impl SessionService for SessionServiceImpl {
let req = request.into_inner();
let mut conn = self.redis.lock().await;
conn.delete(&req.session_id).await.map_err(|_| Status::internal("Failed to delete session from Redis"))?;
conn.delete(&req.session_id)
.await
.map_err(|_| Status::internal("Failed to delete session from Redis"))?;
Ok(Response::new(Empty {}))
}
@@ -99,9 +107,14 @@ impl SessionService for SessionServiceImpl {
let req = request.into_inner();
let conn = self.redis.lock().await;
if let Some(session_data) = conn.get::<String>(&req.session_id).await.map_err(|_| Status::internal("Failed to fetch session from Redis"))? {
if let Some(session_data) = conn
.get::<String>(&req.session_id)
.await
.map_err(|_| Status::internal("Failed to fetch session from Redis"))?
{
let _ = conn.update(&req.session_id, Some(&session_data), Some(300));
let session: Session = serde_json::from_str(&session_data).map_err(|_| Status::internal("Failed to deserialize session"))?;
let session: Session = serde_json::from_str(&session_data)
.map_err(|_| Status::internal("Failed to deserialize session"))?;
let response = SessionResponse {
session_id: req.session_id,