diff --git a/server/stat/src/app/user_app.rs b/server/stat/src/app/user_app.rs index e54ea58..80bf084 100644 --- a/server/stat/src/app/user_app.rs +++ b/server/stat/src/app/user_app.rs @@ -7,6 +7,7 @@ use f9::app::App; use f9::app::HttpContext; use crate::listener::WsListener; use crate::upstream::UpStreamMgr; +//use crate::ss; #[derive(SharedFromSelf)] #[derive(Singleton)] diff --git a/server/stat/src/main.rs b/server/stat/src/main.rs index c4aa310..4ead130 100755 --- a/server/stat/src/main.rs +++ b/server/stat/src/main.rs @@ -4,6 +4,7 @@ mod app; mod listener; mod upstream; mod downstream; +mod ss; use crate::app::UserApp; fn main() { diff --git a/server/stat/src/ss.rs b/server/stat/src/ss.rs new file mode 100644 index 0000000..27c314f --- /dev/null +++ b/server/stat/src/ss.rs @@ -0,0 +1,5 @@ +pub mod ss_proto; +pub mod ss_msgid; + +pub use ss_proto::*; +pub use ss_msgid::*; diff --git a/server/stat/src/upstream/upstreammgr.rs b/server/stat/src/upstream/upstreammgr.rs index 6de4795..f6c7a01 100644 --- a/server/stat/src/upstream/upstreammgr.rs +++ b/server/stat/src/upstream/upstreammgr.rs @@ -12,13 +12,14 @@ use r9_macro::SharedFromSelf; use r9_macro_derive::SharedFromSelf; use r9_macro_derive::Singleton; + #[derive(SharedFromSelf)] #[derive(Singleton)] pub struct UpStreamMgr { _self_wp: Weak::>, } -async fn run_app() -> Result<(), Box> { +async fn run_app(send_queue: Arc::>>) -> Result<(), Box> { let mut stream = TcpStream::connect("192.168.100.39:7617").await?; loop { @@ -72,6 +73,9 @@ impl UpStreamMgr { } pub fn init(&mut self) { + let send_queue: Arc::>> = + Default::default(); + //let msg : Arc::>> = Arc::new(); std::thread::spawn(move || { let rt = tokio::runtime::Builder::new_multi_thread() .worker_threads(4) @@ -81,7 +85,7 @@ impl UpStreamMgr { .build() .unwrap(); rt.block_on(async { - run_app().await; + run_app(send_queue.clone()).await; }); });