skyfffire 2 роки тому
батько
коміт
8ec2dd947a

+ 3 - 1
global/Cargo.toml

@@ -7,4 +7,6 @@ edition = "2021"
 
 [dependencies]
 rust_decimal = "1.32.0"
-rust_decimal_macros = "1.32.0"
+rust_decimal_macros = "1.32.0"
+tracing = "0.1"
+tracing-subscriber = "0.3.17"

+ 2 - 1
global/src/lib.rs

@@ -1 +1,2 @@
-pub mod public_params;
+pub mod public_params;
+pub mod log_utils;

+ 25 - 0
global/src/log_utils.rs

@@ -0,0 +1,25 @@
+use tracing::subscriber;
+
+pub fn init_log_with_debug() {
+    let sub = tracing_subscriber::fmt()
+        .with_max_level(tracing::Level::DEBUG)
+        .with_span_events(tracing_subscriber::fmt::format::FmtSpan::FULL)
+        .finish();
+    subscriber::set_global_default(sub).unwrap();
+}
+
+pub fn init_log_with_trace() {
+    let sub = tracing_subscriber::fmt()
+        .with_max_level(tracing::Level::TRACE)
+        .with_span_events(tracing_subscriber::fmt::format::FmtSpan::FULL)
+        .finish();
+    subscriber::set_global_default(sub).unwrap();
+}
+
+pub fn init_log_with_info() {
+    let sub = tracing_subscriber::fmt()
+        .with_max_level(tracing::Level::INFO)
+        .with_span_events(tracing_subscriber::fmt::format::FmtSpan::FULL)
+        .finish();
+    subscriber::set_global_default(sub).unwrap();
+}

+ 3 - 6
strategy/src/strategy.rs

@@ -1145,19 +1145,16 @@ impl Strategy {
 mod tests {
     use rust_decimal::Decimal;
     use rust_decimal_macros::dec;
-    use tracing::{debug, subscriber};
+    use tracing::{debug};
     use crate::model::{OrderInfo, TraderMsg};
     use crate::params::Params;
     use crate::strategy::Strategy;
 
     #[test]
     fn on_time_test() {
+        global::log_utils::init_log_with_debug();
+
         let params = Params::new("config.toml").unwrap();
-        let sub = tracing_subscriber::fmt()
-            .with_max_level(tracing::Level::DEBUG)
-            .with_span_events(tracing_subscriber::fmt::format::FmtSpan::FULL)
-            .finish();
-        subscriber::set_global_default(sub).expect("策略模块日志初始化错误");
         let mut strategy = Strategy::new(&params, true);
         let mut trader_msg = TraderMsg::new();
         trader_msg.market.append(&mut vec![dec!(0.92), dec!(1.0), dec!(0.89), dec!(0.79), dec!(0.99), dec!(1.0), dec!(0.89), dec!(0.79), dec!(0.89), dec!(0.79), dec!(0.99), dec!(1.0), dec!(0.89), dec!(0.79)]);

+ 1 - 5
tests/order_command_test.rs

@@ -20,11 +20,7 @@ async fn main() {
     params.insert("secret_key".to_string(), secret_key);
     let exchange = Exchange::new(ExchangeEnum::GateSwap, "BTC_USDT".to_string(), false, params);
 
-    let sub = tracing_subscriber::fmt()
-        .with_max_level(tracing::Level::INFO)
-        .with_span_events(tracing_subscriber::fmt::format::FmtSpan::FULL)
-        .finish();
-    subscriber::set_global_default(sub).expect("策略模块日志初始化错误");
+    global::log_utils::init_log_with_info();
 
     let (order_sender, mut order_receiver) = mpsc::channel::<Order>(100);
     let (error_sender, mut error_receiver) = mpsc::channel::<Error>(100);