diff --git a/Cargo.lock b/Cargo.lock index 02e61846e8..87e4843fa9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1181,7 +1181,7 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "hulypulse" -version = "0.1.12" +version = "0.1.13" dependencies = [ "actix", "actix-cors", diff --git a/src/db.rs b/src/db.rs index 5ef4242eb9..aadac7c1ab 100644 --- a/src/db.rs +++ b/src/db.rs @@ -1,9 +1,11 @@ -use std::{sync::Arc}; +use std::sync::Arc; use crate::{ hub_service::{HubState, RedisEvent, RedisEventAction, broadcast_event}, - memory::{MemoryBackend, memory_delete, memory_list, memory_read, memory_save, memory_info}, - redis::{RedisArray, SaveMode, Ttl, redis_delete, redis_list, redis_read, redis_save, redis_info}, + memory::{MemoryBackend, memory_delete, memory_info, memory_list, memory_read, memory_save}, + redis::{ + RedisArray, SaveMode, Ttl, redis_delete, redis_info, redis_list, redis_read, redis_save, + }, }; use ::redis::aio::MultiplexedConnection; use tokio::sync::RwLock; @@ -34,8 +36,9 @@ impl Db { } } - pub async fn info(&self) -> redis::RedisResult { // String { - // let res = + pub async fn info(&self) -> redis::RedisResult { + // String { + // let res = match &self.inner { DbInner::Memory(m) => memory_info(m).await, DbInner::Redis(conn) => { diff --git a/src/handlers_ws.rs b/src/handlers_ws.rs index 0011b86d35..dde3f6c04e 100644 --- a/src/handlers_ws.rs +++ b/src/handlers_ws.rs @@ -124,7 +124,7 @@ pub enum WsCommand { Info { #[serde(default)] correlation: Option, - } + }, } use hulyrs::services::jwt::Claims; @@ -220,9 +220,7 @@ impl WsSession { /// When valid JSON recieved for WsSession fn handle_command(&mut self, cmd: WsCommand, ctx: &mut ws::WebsocketContext) { - match cmd { - // INFO WsCommand::Info { correlation } => { tracing::info!("INFO"); diff --git a/src/main.rs b/src/main.rs index 318a1cffd0..4b4a06a348 100644 --- a/src/main.rs +++ b/src/main.rs @@ -170,27 +170,24 @@ async fn main() -> anyhow::Result<()> { .route( "/status", web::get().to({ - move | - hub_state: web::Data>>, - db_backend: web::Data, - | { + move |hub_state: web::Data>>, db_backend: web::Data| { let hub_state = hub_state.clone(); async move { - let info = db_backend.info().await.unwrap_or_else(|_| "error".to_string()); + let info = db_backend + .info() + .await + .unwrap_or_else(|_| "error".to_string()); let count = hub_state.read().await.count(); - Ok::<_, actix_web::Error>( - HttpResponse::Ok() - .json(json!({ - "memory_info": info, - "db_mode": if CONFIG.memory_mode == Some(true) { - "memory" - } else { - "redis" - }, - "websockets": count, - "status": "OK", - })), - ) + Ok::<_, actix_web::Error>(HttpResponse::Ok().json(json!({ + "memory_info": info, + "db_mode": if CONFIG.memory_mode == Some(true) { + "memory" + } else { + "redis" + }, + "websockets": count, + "status": "OK", + }))) } } }), diff --git a/src/redis.rs b/src/redis.rs index 741851c696..7e205ae33c 100644 --- a/src/redis.rs +++ b/src/redis.rs @@ -85,17 +85,16 @@ pub fn deprecated_symbol_error(s: &str) -> redis::RedisResult<()> { } } +// if CONFIG.memory_mode == Some(true) { - // if CONFIG.memory_mode == Some(true) { - - // // memory_status - // let map = hub_state.read().await; - // let memory_keys = format!("{} keys in memory", map.len()); - // let memory_bytes = format!("{} bytes used", map.values().map(|v| v.data.len()).sum::()); - // format!("{} keys, {} bytes", memory_keys, memory_bytes) - // } else { - // let mut conn = db_backend.redis_connection.lock().await; - // }; +// // memory_status +// let map = hub_state.read().await; +// let memory_keys = format!("{} keys in memory", map.len()); +// let memory_bytes = format!("{} bytes used", map.values().map(|v| v.data.len()).sum::()); +// format!("{} keys, {} bytes", memory_keys, memory_bytes) +// } else { +// let mut conn = db_backend.redis_connection.lock().await; +// }; /// redis_info(&connection) pub async fn redis_info(conn: &mut MultiplexedConnection) -> redis::RedisResult { @@ -128,7 +127,6 @@ pub async fn redis_info(conn: &mut MultiplexedConnection) -> redis::RedisResult< )) } - /// redis_list(&connection,prefix) pub async fn redis_list( conn: &mut MultiplexedConnection,