...

src/main.rs

@@ -2,7 +2,7 @@
 
 use tokio::net::TcpListener;
 
-use redis_rs::{options::ReplicationOption, server};
+use redis_rs::server;
 
 use clap::Parser;
 
@@ -14,17 +14,10 @@ struct Args {
     #[arg(long)]
     dir: String,
 
-    /// The name of the Redis DB file
-    #[arg(long)]
-    dbfilename: String,
 
     /// The port of the Redis server, default is 6379 if not specified
     #[arg(long)]
     port: Option<u16>,
-
-    /// The address of the master Redis server, if the server is a replica. None if the server is a master.
-    #[arg(long)]
-    replicaof: Option<String>,
 }
 
 #[tokio::main]
@@ -42,42 +35,11 @@ async fn main() {
     // new DB option
     let option = redis_rs::options::DBOption {
         dir: args.dir,
-        db_file_name: args.dbfilename,
         port,
-        replication: ReplicationOption {
-            role: if let Some(_) = args.replicaof {
-                "slave".to_string()
-            } else {
-                "master".to_string()
-            },
-            master_replid: "8371b4fb1155b71f4a04d3e1bc3e18c4a990aeea".to_string(), // should be a random string but hard code for now
-            master_repl_offset: 0,
-            replica_of: args.replicaof,
-        },
     };
 
     // new server
-    let mut server = server::Server::new(option).await;
-
-    //start receive replication cmds for slave
-    if server.is_slave() {
-        let mut sc = server.clone();
-
-        let mut follower_repl_client = server.get_follower_repl_client().await.unwrap();
-        follower_repl_client.ping_master().await.unwrap();
-        follower_repl_client
-            .report_port(server.option.port)
-            .await
-            .unwrap();
-        follower_repl_client.report_sync_protocol().await.unwrap();
-        follower_repl_client.start_psync(&mut sc).await.unwrap();
-
-        tokio::spawn(async move {
-            if let Err(e) = sc.handle(follower_repl_client.stream, true).await {
-                println!("error: {:?}, will close the connection. Bye", e);
-            }
-        });
-    }
+    let server = server::Server::new(option).await;
 
     // accept new connections
     loop {
@@ -88,7 +50,7 @@ async fn main() {
 
                 let mut sc = server.clone();
                 tokio::spawn(async move {
-                    if let Err(e) = sc.handle(stream, false).await {
+                    if let Err(e) = sc.handle(stream).await {
                         println!("error: {:?}, will close the connection. Bye", e);
                     }
                 });