code format, update lock file (version)

Signed-off-by: Alexey Aristov <aav@acm.org>

Cargo.lock

@@ -1181,7 +1181,7 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
 
 [[package]]
 name = "hulypulse"
-version = "0.1.12"
+version = "0.1.13"
 dependencies = [
  "actix",
  "actix-cors",

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> { // String {
-        // let res = 
+    pub async fn info(&self) -> redis::RedisResult<String> {
+        // String {
+        // let res =
         match &self.inner {
             DbInner::Memory(m) => memory_info(m).await,
             DbInner::Redis(conn) => {

src/handlers_ws.rs

@@ -124,7 +124,7 @@ pub enum WsCommand {
     Info {
         #[serde(default)]
         correlation: Option<String>,
-    }
+    },
 }
 
 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<Self>) {
-
         match cmd {
-
             // INFO
             WsCommand::Info { correlation } => {
                 tracing::info!("INFO");

src/main.rs

@@ -170,27 +170,24 @@ async fn main() -> anyhow::Result<()> {
             .route(
                 "/status",
                 web::get().to({
-                    move |
-                        hub_state: web::Data<Arc<RwLock<HubState>>>,
-                        db_backend: web::Data<Db>,
-                    | {
+                    move |hub_state: web::Data<Arc<RwLock<HubState>>>, db_backend: web::Data<Db>| {
                         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",
+                            })))
                         }
                     }
                 }),

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::<usize>());
-                            //     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::<usize>());
+//     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<String> {
@@ -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,