run init

rustfs/Cargo.toml

@@ -11,21 +11,20 @@ rust-version.workspace = true
 
 [[bin]]
 name = "rustfs"
-required-features = ["binary"]
+# required-features = ["binary"]
 
 
-[features]
-binary = ["tokio/full", "dep:clap", "dep:tracing-subscriber", "dep:hyper-util"]
+# [features]
+# binary = ["tokio/full", "dep:clap", "dep:tracing-subscriber", "dep:hyper-util"]
 
 [dependencies]
 ecstore = { path = "../ecstore" }
-# time = { workspace = true, features = ["parsing", "formatting"] }
-# s3s = "0.10.0"
-hyper-util = { version = "0.1.5", optional = true, features = ["server-auto", "server-graceful", "http1", "http2", "tokio"] }
-tokio.workspace = true
-clap = { version = "4.5.7", optional = true, features = ["derive"] }
-# tracing.workspace = true
-# tokio-util.workspace = true
-tracing-subscriber = { version = "0.3.18", optional = true, features = ["env-filter", "time"] }
+time = { workspace = true, features = ["parsing", "formatting"] }
 s3s = "0.10.0"
-# async-trait = "0.1.80"
+hyper-util = { version = "0.1.5", features = ["server-auto", "server-graceful", "http1", "http2", "tokio"] }
+tokio.workspace = true
+clap = { version = "4.5.7", features = ["derive"] }
+tracing.workspace = true
+tokio-util.workspace = true
+tracing-subscriber = { version = "0.3.18", features = ["env-filter", "time"] }
+async-trait = "0.1.80"

rustfs/src/main.rs

@@ -1,8 +1,5 @@
-#![forbid(unsafe_code)]
-#![deny(clippy::all, clippy::pedantic)]
-
-use s3s_fs::FileSystem;
-use s3s_fs::Result;
+use ecstore::error::Result;
+use ecstore::store::ECStore;
 
 use s3s::auth::SimpleAuth;
 use s3s::service::S3ServiceBuilder;
@@ -26,23 +23,30 @@ struct Opt {
     host: String,
 
     /// Port number to listen on.
-    #[arg(long, default_value = "8014")] // The original design was finished on 2020-08-14.
+    #[arg(long, default_value = "9010")]
     port: u16,
 
     /// Access key used for authentication.
-    #[arg(long)]
+    #[arg(long, default_value = "AKEXAMPLERUSTFS")]
     access_key: Option<String>,
 
     /// Secret key used for authentication.
-    #[arg(long)]
+    #[arg(long, default_value = "SKEXAMPLERUSTFS")]
     secret_key: Option<String>,
 
     /// Domain name used for virtual-hosted-style requests.
     #[arg(long)]
     domain_name: Option<String>,
 
-    /// Root directory of stored data.
-    root: PathBuf,
+    #[arg(
+        required = true,
+        help = r#"DIR points to a directory on a filesystem. When you want to combine
+multiple drives into a single large system, pass one directory per
+filesystem separated by space. You may also use a '...' convention
+to abbreviate the directory arguments. Remote directories in a
+distributed setup are encoded as HTTP(s) URIs."#
+    )]
+    volumes: Vec<String>,
 }
 
 fn setup_tracing() {
@@ -89,11 +93,11 @@ fn main() -> Result {
 #[tokio::main]
 async fn run(opt: Opt) -> Result {
     // Setup S3 provider
-    let fs = FileSystem::new(opt.root)?;
+    let sto = ECStore::new(opt.volumes)?;
 
     // Setup S3 service
     let service = {
-        let mut b = S3ServiceBuilder::new(fs);
+        let mut b = S3ServiceBuilder::new(sto);
 
         // Enable authentication
         if let (Some(ak), Some(sk)) = (opt.access_key, opt.secret_key) {