11use clap:: Parser ;
2+ use dotenv;
23use slayerfs:: cadapter:: client:: ObjectClient ;
34use slayerfs:: cadapter:: s3:: { S3Backend , S3Config } ;
45use slayerfs:: chuck:: chunk:: ChunkLayout ;
@@ -7,7 +8,6 @@ use slayerfs::fuse::mount::mount_vfs_unprivileged;
78use slayerfs:: vfs:: fs:: VFS ;
89use std:: path:: PathBuf ;
910use tokio:: signal;
10- use dotenv;
1111
1212#[ derive( Parser ) ]
1313#[ command( author, version, about, long_about = None ) ]
@@ -80,7 +80,7 @@ fn process_config_for_backend(
8080async fn main ( ) -> Result < ( ) , Box < dyn std:: error:: Error > > {
8181 // 加载 .env 文件
8282 dotenv:: dotenv ( ) . ok ( ) ;
83-
83+
8484 let format = tracing_subscriber:: fmt:: format ( ) . with_ansi ( false ) ;
8585 tracing_subscriber:: fmt ( ) . event_format ( format) . init ( ) ;
8686
@@ -94,18 +94,19 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
9494 #[ cfg( target_os = "linux" ) ]
9595 {
9696 let args = Args :: parse ( ) ;
97-
97+
9898 // 从环境变量获取配置,命令行参数优先
99- let bucket = args. bucket
99+ let bucket = args
100+ . bucket
100101 . or_else ( || std:: env:: var ( "S3_BUCKET" ) . ok ( ) )
101102 . ok_or ( "S3 bucket must be specified via --bucket or S3_BUCKET env var" ) ?;
102-
103- let endpoint = args. endpoint
103+
104+ let endpoint = args
105+ . endpoint
104106 . or_else ( || std:: env:: var ( "S3_ENDPOINT" ) . ok ( ) )
105107 . unwrap_or_else ( || "http://127.0.0.1:9000" . to_string ( ) ) ;
106-
107- let region = args. region
108- . or_else ( || std:: env:: var ( "AWS_REGION" ) . ok ( ) ) ;
108+
109+ let region = args. region . or_else ( || std:: env:: var ( "AWS_REGION" ) . ok ( ) ) ;
109110
110111 println ! ( "=== SlayerFS Persistence + S3 Demo ===" ) ;
111112 println ! ( "Environment variables loaded from .env file" ) ;
0 commit comments