mirror of
https://github.com/EasyTier/EasyTier.git
synced 2026-09-01 16:59:21 +00:00
refactor: remove ScopedTask (#2125)
* replace ScopedTask with AbortOnDropHandle
This commit is contained in:
@@ -7,7 +7,7 @@ use std::{
|
||||
|
||||
use anyhow::Context;
|
||||
use easytier::{
|
||||
common::{config::ConfigSource, scoped_task::ScopedTask},
|
||||
common::config::ConfigSource,
|
||||
proto::{
|
||||
api::manage::{
|
||||
ConfigSource as RpcConfigSource, NetworkConfig, NetworkMeta, RunNetworkInstanceRequest,
|
||||
@@ -21,6 +21,7 @@ use easytier::{
|
||||
tunnel::Tunnel,
|
||||
};
|
||||
use tokio::sync::{RwLock, broadcast};
|
||||
use tokio_util::task::AbortOnDropHandle;
|
||||
|
||||
use super::storage::{Storage, StorageToken, WeakRefStorage};
|
||||
use crate::FeatureFlags;
|
||||
@@ -475,7 +476,7 @@ pub struct Session {
|
||||
|
||||
data: SharedSessionData,
|
||||
|
||||
run_network_on_start_task: Option<ScopedTask<()>>,
|
||||
run_network_on_start_task: Option<AbortOnDropHandle<()>>,
|
||||
}
|
||||
|
||||
impl Debug for Session {
|
||||
@@ -517,14 +518,14 @@ impl Session {
|
||||
self.rpc_mgr.run_with_tunnel(tunnel);
|
||||
|
||||
let data = self.data.read().await;
|
||||
self.run_network_on_start_task.replace(
|
||||
tokio::spawn(Self::run_network_on_start(
|
||||
data.heartbeat_waiter(),
|
||||
data.storage.clone(),
|
||||
self.scoped_rpc_client(),
|
||||
))
|
||||
.into(),
|
||||
);
|
||||
self.run_network_on_start_task
|
||||
.replace(AbortOnDropHandle::new(tokio::spawn(
|
||||
Self::run_network_on_start(
|
||||
data.heartbeat_waiter(),
|
||||
data.storage.clone(),
|
||||
self.scoped_rpc_client(),
|
||||
),
|
||||
)));
|
||||
}
|
||||
|
||||
fn collect_webhook_source_instance_ids(
|
||||
|
||||
Reference in New Issue
Block a user