dumtruck/konobangu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: fix task lifetime

Browse Source
This commit is contained in:
master 2025-06-28 04:10:18 +08:00
parent c858cc7d44
commit f83371bbf9
3 changed files with 39 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
apps/recorder/src/task/config.rs
View File

@ -8,10 +8,10 @@ pub struct TaskConfig {
pub subscriber_task_concurrency: u32, pub subscriber_task_concurrency: u32,
#[serde(default = "default_system_task_workers")] #[serde(default = "default_system_task_workers")]
pub system_task_concurrency: u32, pub system_task_concurrency: u32,
#[serde(default = "default_subscriber_task_timeout")] #[serde(default = "default_subscriber_task_reenqueue_orphaned_after")]
pub subscriber_task_timeout: Duration, pub subscriber_task_reenqueue_orphaned_after: Duration,
#[serde(default = "default_system_task_timeout")] #[serde(default = "default_system_task_reenqueue_orphaned_after")]
pub system_task_timeout: Duration, pub system_task_reenqueue_orphaned_after: Duration,
#[serde(default = "default_cron_retry_duration")] #[serde(default = "default_cron_retry_duration")]
pub cron_retry_duration: Duration, pub cron_retry_duration: Duration,
} }
@ -21,8 +21,9 @@ impl Default for TaskConfig {
Self { Self {
subscriber_task_concurrency: default_subscriber_task_workers(), subscriber_task_concurrency: default_subscriber_task_workers(),
system_task_concurrency: default_system_task_workers(), system_task_concurrency: default_system_task_workers(),
subscriber_task_timeout: default_subscriber_task_timeout(), subscriber_task_reenqueue_orphaned_after:
system_task_timeout: default_system_task_timeout(), default_subscriber_task_reenqueue_orphaned_after(),
system_task_reenqueue_orphaned_after: default_system_task_reenqueue_orphaned_after(),
cron_retry_duration: default_cron_retry_duration(), cron_retry_duration: default_cron_retry_duration(),
} }
} }
@ -44,11 +45,11 @@ pub fn default_system_task_workers() -> u32 {
} }
} }
pub fn default_subscriber_task_timeout() -> Duration { pub fn default_subscriber_task_reenqueue_orphaned_after() -> Duration {
Duration::from_secs(3600) Duration::from_secs(3600)
} }
pub fn default_system_task_timeout() -> Duration { pub fn default_system_task_reenqueue_orphaned_after() -> Duration {
Duration::from_secs(3600) Duration::from_secs(3600)
} }

8
apps/recorder/src/task/service.rs
View File

@ -41,10 +41,10 @@ impl TaskService {
}; };
let pool = ctx.db().get_postgres_connection_pool().clone(); let pool = ctx.db().get_postgres_connection_pool().clone();
let subscriber_task_storage_config = let subscriber_task_storage_config = Config::new(SUBSCRIBER_TASK_APALIS_NAME)
Config::new(SUBSCRIBER_TASK_APALIS_NAME).set_keep_alive(config.subscriber_task_timeout); .set_reenqueue_orphaned_after(config.subscriber_task_reenqueue_orphaned_after);
let system_task_storage_config = let system_task_storage_config = Config::new(SYSTEM_TASK_APALIS_NAME)
Config::new(SYSTEM_TASK_APALIS_NAME).set_keep_alive(config.system_task_timeout); .set_reenqueue_orphaned_after(config.system_task_reenqueue_orphaned_after);
let subscriber_task_storage = let subscriber_task_storage =
ApalisPostgresStorage::new_with_config(pool.clone(), subscriber_task_storage_config); ApalisPostgresStorage::new_with_config(pool.clone(), subscriber_task_storage_config);
let system_task_storage = let system_task_storage =

52
apps/webui/src/presentation/routes/_app/subscriptions/detail.$id.tsx
View File

@ -212,20 +212,6 @@ function SubscriptionDetailRouteComponent() {
View subscription detail View subscription detail
</CardDescription> </CardDescription>
</div> </div>
<div className="flex gap-2">
<Button
variant="outline"
size="sm"
onClick={() =>
navigate({
to: '/tasks/manage',
})
}
>
<ListIcon className="h-4 w-4" />
Tasks
</Button>
</div>
</div> </div>
</CardHeader> </CardHeader>
<CardContent> <CardContent>
@ -439,18 +425,32 @@ function SubscriptionDetailRouteComponent() {
<div className="space-y-4"> <div className="space-y-4">
<div className="flex items-center justify-between"> <div className="flex items-center justify-between">
<Label className="font-medium text-sm">Associated Tasks</Label> <Label className="font-medium text-sm">Associated Tasks</Label>
<Dialog> <div className="flex gap-2">
<DialogTrigger asChild> <Button
<Button variant="outline" size="sm"> variant="outline"
<RefreshCcwIcon className="h-4 w-4" /> size="sm"
Sync onClick={() =>
</Button> navigate({
</DialogTrigger> to: '/tasks/manage',
<SubscriptionSyncDialogContent })
id={subscription.id} }
onCancel={handleReload} >
/> <ListIcon className="h-4 w-4" />
</Dialog> Tasks
</Button>
<Dialog>
<DialogTrigger asChild>
<Button variant="outline" size="sm">
<RefreshCcwIcon className="h-4 w-4" />
Sync
</Button>
</DialogTrigger>
<SubscriptionSyncDialogContent
id={subscription.id}
onCancel={handleReload}
/>
</Dialog>
</div>
</div> </div>
<div className="grid grid-cols-1 gap-3 sm:grid-cols-2 lg:grid-cols-3"> <div className="grid grid-cols-1 gap-3 sm:grid-cols-2 lg:grid-cols-3">
{subscription.subscriberTask?.nodes && {subscription.subscriberTask?.nodes &&