|
|
@@ -19,8 +19,29 @@ fn log_level_init(log_str: String, port: u32, account_name: String) -> WorkerGua
|
|
|
}
|
|
|
|
|
|
// 获取本地配置
|
|
|
-fn read_params() -> Params {
|
|
|
- let mut path = "config.toml";
|
|
|
+// fn read_params() -> Params {
|
|
|
+// let mut path = "config.toml";
|
|
|
+//
|
|
|
+// let args: Vec<String> = std::env::args().collect();
|
|
|
+//
|
|
|
+// for arg in &args {
|
|
|
+// if !arg.contains("--config") {
|
|
|
+// continue;
|
|
|
+// }
|
|
|
+//
|
|
|
+// let p: Vec<&str> = arg.split("=").collect();
|
|
|
+// path = p[1];
|
|
|
+// }
|
|
|
+//
|
|
|
+// println!("配置文件路径:{}", path);
|
|
|
+// let params = Params::new(path).unwrap();
|
|
|
+//
|
|
|
+// return params;
|
|
|
+// }
|
|
|
+
|
|
|
+// 获取本地配置- json 文件解析
|
|
|
+fn read_params_json() -> Params {
|
|
|
+ let mut path = "config.json";
|
|
|
|
|
|
let args: Vec<String> = std::env::args().collect();
|
|
|
|
|
|
@@ -28,21 +49,21 @@ fn read_params() -> Params {
|
|
|
if !arg.contains("--config") {
|
|
|
continue;
|
|
|
}
|
|
|
-
|
|
|
let p: Vec<&str> = arg.split("=").collect();
|
|
|
path = p[1];
|
|
|
}
|
|
|
|
|
|
println!("配置文件路径:{}", path);
|
|
|
- let params = Params::new(path).unwrap();
|
|
|
-
|
|
|
+ let params = Params::new_json(path).unwrap();
|
|
|
return params;
|
|
|
}
|
|
|
|
|
|
#[tokio::main(flavor = "multi_thread", worker_threads = 2)]
|
|
|
async fn main() {
|
|
|
// 日志级别配置
|
|
|
- let params = read_params();
|
|
|
+ // let params = read_params();
|
|
|
+ let params = read_params_json();
|
|
|
+
|
|
|
// 日志级别配置
|
|
|
let _guard = log_level_init(params.log_level.clone(), params.port.clone(), params.account_name.clone());
|
|
|
info!("配置读取成功:{:?}。", params);
|