Sasta uses ENV var for Redis URL

casta/src/sasta.rs

@@ -110,7 +110,7 @@ impl Sasta {
                     return None
                 },
             };
-            
+
             let msg = match res {
                 Ok(m) => m,
                 Err(e) => {

sasta/.env.template

@@ -0,0 +1 @@
+REDIS_URL="<URL to Redis db>" # Example for localhost: "redis://127.0.0.1:6381"

sasta/.gitignore

@@ -1,4 +1,5 @@
 target/
 content.json
 redis-data/
-/file_server/
+/file_server/
+.env

sasta/Cargo.toml

@@ -31,3 +31,4 @@ utoipa-swagger-ui = { version = "4.0.0", features = ["axum"] }
 utoipa = { version = "4.0.0", features = ["axum_extras", "uuid"] }
 utoipa-redoc = { version = "1.0.0", features = ["axum"] }
 utoipa-rapidoc = { version = "1.0.0", features = ["axum"] }
+dotenv = "0.15.0"

sasta/src/file_server/file_server.rs

@@ -201,8 +201,8 @@ pub struct FileServer {
 }
 
 impl FileServer {
-    pub async fn new() -> Self {
-        let client = Client::open("redis://127.0.0.1:6379").unwrap();
+    pub async fn new(redis_url: &str) -> Self {
+        let client = Client::open(redis_url).unwrap();
         let mut con = client.get_async_connection().await.unwrap();
 
         let root = match con.json_get::<_, _, String>("files", ".").await {
@@ -309,4 +309,4 @@ impl FileServer {
             // error_span!("Logging current state instead", ?self.content);
         }
     }
-}
+}

sasta/src/main.rs

@@ -1,7 +1,8 @@
-use std::{net::SocketAddr, sync::Arc, vec, collections::HashSet};
+use std::{net::SocketAddr, sync::Arc, vec, collections::HashSet, env};
 
 use axum::{Router, routing::{get, post, put, delete}, extract::{WebSocketUpgrade, ConnectInfo, State, Path}, response::IntoResponse, Json, ServiceExt};
 use axum_macros::debug_handler;
+use dotenv::dotenv;
 use hyper::StatusCode;
 use store::store::Store;
 use tokio::sync::{oneshot, Mutex};
@@ -62,14 +63,17 @@ struct ApiDoc;
 
 #[tokio::main]
 async fn main() {
+    dotenv().ok();
+    let redis_url = env::var("REDIS_URL").expect("REDIS_URL variable must be set");
+
     let subscriber = FmtSubscriber::builder()
         .with_span_events(FmtSpan::NEW)
         .with_max_level(Level::TRACE)
         .finish();
     tracing::subscriber::set_global_default(subscriber).expect("setting default subscriber failed");
 
-    let store = Arc::new(Store::new().await);
-    let file_server = Arc::new(Mutex::new(FileServer::new().await));
+    let store = Arc::new(Store::new(&redis_url).await);
+    let file_server = Arc::new(Mutex::new(FileServer::new(&redis_url).await));
 
     let store_copy = store.clone();
     let (tx, rx) = oneshot::channel::<()>();

sasta/src/store/store.rs

@@ -93,8 +93,8 @@ pub struct Store {
 }
 
 impl Store {
-    pub async fn new() -> Self {
-        let client = Client::open("redis://127.0.0.1:6379").unwrap();
+    pub async fn new(redis_url: &str) -> Self {
+        let client = Client::open(redis_url).unwrap();
         let mut con = client.get_async_connection().await.unwrap();
         let (sender, _) = broadcast::channel(5);
         let content = RwLock::new(Self::read_file(&mut con).await);