update docker compose and cdn src Moving some event to private api #41

docker-compose/docker-compose.yaml

@@ -22,6 +22,8 @@ services:
     command: redis-server --save 20 1 --loglevel warning
     volumes:
       - redis:/data
+    expose:
+      - 6379
 
 
   shartube-comic-server:

server/cdn-service/src/main.rs

@@ -2,7 +2,6 @@ extern crate dotenv;
 mod types;
 mod upload_images;
 
-use std::sync::Arc;
 mod util;
 mod ws;
 
@@ -16,16 +15,14 @@ mod route;
 #[tokio::main]
 async fn main() {
     dotenv().ok();
-    let redis_client = Arc::new(
-        redis::Client::open(format!(
-            "redis://{}:{}",
-            std::env::var("REDIS_HOST").unwrap(),
-            std::env::var("REDIS_PORT").unwrap()
-        ))
-        .unwrap(),
-    );
+    let redis_client = redis::Client::open(format!(
+        "redis://{}:{}",
+        std::env::var("REDIS_HOST").unwrap(),
+        std::env::var("REDIS_PORT").unwrap()
+    ))
+    .unwrap();
 
-    dbg!(&redis_client.get_connection_info().addr);
+    dbg!(&redis_client.get_connection_info().addr.to_string());
 
     handle_socket_message(redis_client.clone()).await;
 

server/cdn-service/src/types.rs

@@ -1,4 +1,4 @@
-use std::{collections::HashMap, sync::Arc};
+use std::collections::HashMap;
 
 use redis::{from_redis_value, ErrorKind, FromRedisValue, RedisResult, Value};
 use serde::{Deserialize, Serialize};
@@ -69,8 +69,6 @@ impl FromRedisValue for TokenStorageTableNode {
         })
     }
 }
-// convert to db soon
-// pub type TokenStorageTable = Arc<Mutex<BTreeMap<String, TokenStorageTableNode>>>;
 pub enum WsError {
     DecodePayloadError,
 }
@@ -80,4 +78,4 @@ pub struct SendWsErrorMetaInput {
     pub id: String,
 }
 
-pub type RedisClient = Arc<redis::Client>;
+pub type RedisClient = redis::Client;

server/docker-compose.yml

@@ -25,6 +25,8 @@ services:
       - redis:/data
     ports:
       - 6379:6379
+    expose:
+      - 6379
 
   shartube-graphql-gateway:
     container_name: shartube-graphql-gateway