feat: 调整未配置数据目录的默认目录取值，linux、macos默认目录调整为~/.local/share/r-nacos/nacos_db，windows与docker中取nacos_db(与之前一致) nacos-group#78

Author: heqingpan

Dockerfile

@@ -7,6 +7,7 @@ FROM debian:bookworm-slim
 # RUN apt-get update && apt-get install -y extra-runtime-dependencies && rm -rf /var/lib/apt/lists/*
 COPY --from=builder /usr/local/cargo/bin/rnacos /usr/bin/rnacos
 ENV USER root
+ENV RNACOS_RUN_IN_DOCKER=true
 RUN mkdir /io
 WORKDIR /io
 ENTRYPOINT ["/usr/bin/rnacos"]

docker/alpine_dockerfile

@@ -27,6 +27,7 @@ RUN cd /rnacos && \
 FROM alpine
 ENV PATH /root/.cargo/bin:$PATH
 ENV USER root
+ENV RNACOS_RUN_IN_DOCKER=true
 RUN mkdir /io
 COPY --from=builder /usr/bin/rnacos /usr/bin/rnacos
 WORKDIR /io

docker/gnu_dockerfile

@@ -19,6 +19,7 @@ FROM debian:bookworm-slim
 # RUN apt-get update && apt-get install -y extra-runtime-dependencies && rm -rf /var/lib/apt/lists/*
 COPY --from=builder /usr/bin/rnacos /usr/bin/rnacos
 ENV USER root
+ENV RNACOS_RUN_IN_DOCKER=true
 RUN mkdir /io
 WORKDIR /io
 ENTRYPOINT ["/usr/bin/rnacos"]

docker/pre_dockerfile

@@ -19,6 +19,7 @@ FROM debian:bookworm-slim
 # RUN apt-get update && apt-get install -y extra-runtime-dependencies && rm -rf /var/lib/apt/lists/*
 COPY --from=builder /usr/bin/rnacos /usr/bin/rnacos
 ENV USER root
+ENV RNACOS_RUN_IN_DOCKER=true
 RUN mkdir /io
 WORKDIR /io
 ENTRYPOINT ["/usr/bin/rnacos"]

src/common/mod.rs

@@ -52,7 +52,7 @@ impl NamingSysConfig {
 #[derive(Default, Clone, Debug)]
 pub struct AppSysConfig {
     pub config_db_file: String,
-    pub config_db_dir: String,
+    pub local_db_dir: String,
     pub config_max_content: usize,
     pub http_port: u16,
     pub http_console_port: u16,
@@ -78,6 +78,7 @@ pub struct AppSysConfig {
     pub metrics_log_interval_second: u64,
     pub metrics_log_enable: bool,
     pub console_captcha_enable: bool,
+    pub run_in_docker: bool,
 }
 
 impl AppSysConfig {
@@ -105,7 +106,10 @@ impl AppSysConfig {
             .unwrap_or("".to_owned())
             .parse()
             .unwrap_or(http_port + 2000);
-        let config_db_dir = std::env::var("RNACOS_CONFIG_DB_DIR").unwrap_or("nacos_db".to_owned());
+        let run_in_docker = std::env::var("RNACOS_RUN_IN_DOCKER")
+            .unwrap_or("".to_owned())
+            .eq_ignore_ascii_case("true");
+        let local_db_dir = Self::get_data_dir(run_in_docker);
         let raft_node_id = std::env::var("RNACOS_RAFT_NODE_ID")
             .unwrap_or("1".to_owned())
             .parse()
@@ -189,7 +193,7 @@ impl AppSysConfig {
             metrics_collect_interval_second = metrics_log_interval_second;
         }
         Self {
-            config_db_dir,
+            local_db_dir,
             config_db_file,
             config_max_content,
             http_port,
@@ -216,6 +220,26 @@ impl AppSysConfig {
             metrics_collect_interval_second,
             metrics_log_interval_second,
             console_captcha_enable,
+            run_in_docker,
+        }
+    }
+
+    /// 获取数据目录
+    fn get_data_dir(run_in_docker: bool) -> String {
+        if let Ok(v) = std::env::var("RNACOS_DATA_DIR") {
+            v
+        } else if let Ok(v) = std::env::var("RNACOS_CONFIG_DB_DIR") {
+            v
+        } else if run_in_docker {
+            // 运行在docker，默认值保持一致
+            "nacos_db".to_owned()
+        } else {
+            #[cfg(any(target_os = "linux", target_os = "macos"))]
+            {
+                return "~/.local/share/r-nacos/nacos_db".to_string();
+            }
+            // windows系统默认值保持一致
+            "nacos_db".to_owned()
         }
     }
 

src/main.rs

@@ -56,9 +56,11 @@ async fn main() -> Result<(), Box<dyn Error>> {
     init_env();
     let rust_log = std::env::var("RUST_LOG").unwrap_or("info".to_owned());
     println!("version:{}, RUST_LOG:{}", APP_VERSION, &rust_log);
-    std::env::set_var("RUST_LOG", &rust_log);
+    unsafe {
+        std::env::set_var("RUST_LOG", &rust_log);
+    }
     let sys_config = Arc::new(AppSysConfig::init_from_env());
-    println!("data dir:{}", sys_config.config_db_dir);
+    println!("data dir:{}", sys_config.local_db_dir);
     let timezone_fmt = Arc::new(TimeZoneFormatEnv::new(
         sys_config.gmt_fixed_offset_hours.map(|v| v * 60 * 60),
         Some(TimestampPrecision::Micros),

src/starter.rs

@@ -48,20 +48,8 @@ use bean_factory::{BeanDefinition, BeanFactory, FactoryData};
 use chrono::{FixedOffset, Local, Offset};
 
 pub async fn config_factory(sys_config: Arc<AppSysConfig>) -> anyhow::Result<FactoryData> {
-    /*
-    let db = Arc::new(
-        sled::Config::new()
-            .path(&sys_config.config_db_dir)
-            .mode(sled::Mode::LowSpace)
-            .cache_capacity(10 * 1024 * 1024)
-            //.flush_every_ms(Some(1000))
-            .open()
-            .unwrap(),
-    );
-    factory.register(BeanDefinition::from_obj(db.clone()));
-     */
-    std::fs::create_dir_all(sys_config.config_db_dir.as_str())?;
-    let base_path = Arc::new(sys_config.config_db_dir.clone());
+    std::fs::create_dir_all(sys_config.local_db_dir.as_str())?;
+    let base_path = Arc::new(sys_config.local_db_dir.clone());
     let factory = BeanFactory::new();
     factory.register(BeanDefinition::from_obj(sys_config.clone()));