diff --git a/server/stat/src/upstream/upstream.rs b/server/stat/src/upstream/upstream.rs index 6227cf4..0cbb0c7 100644 --- a/server/stat/src/upstream/upstream.rs +++ b/server/stat/src/upstream/upstream.rs @@ -30,10 +30,11 @@ impl UpStream { pub fn init(&self, rt: &tokio::runtime::Runtime) { { - //let down_pack_queue = self.down_pack_queue.clone(); - //let up_pack_queue = self.up_pack_queue.clone(); + let down_pack_queue = self.down_pack_queue.clone(); + let up_pack_queue = self.up_pack_queue.clone(); + let address = format!("{0}:{1}", self.remote_ip, self.remote_port); rt.spawn(async move { - let mut result = TcpStream::connect("192.168.100.39:7616").await; + let mut result = TcpStream::connect(address).await; match result { Ok(v) => { let a = Arc::new(Mutex::new(v)); diff --git a/server/stat/src/upstream/upstreammgr.rs b/server/stat/src/upstream/upstreammgr.rs index 0ad28d5..bcc7a90 100644 --- a/server/stat/src/upstream/upstreammgr.rs +++ b/server/stat/src/upstream/upstreammgr.rs @@ -9,8 +9,8 @@ use crate::app::UserApp; pub struct UpStreamMgr { curr_id: i16, - key_hash: Rc::>>>, - id_hash: Rc::>>>, + key_hash: RefCell::>>, + id_hash: RefCell::>>, tokio_rt: Runtime, } unsafe impl Send for UpStreamMgr{} @@ -36,6 +36,7 @@ impl UpStreamMgr { pub fn init(&self) { let upstream = Rc::new(UpStream::new(1, "192.168.100.39".to_string(), 7616)); + self.key_hash.borrow_mut().insert("".to_string(), upstream.clone()); self.id_hash.borrow_mut().insert(upstream.instance_id, upstream.clone()); upstream.init(&self.tokio_rt);