fix: fix task lifetime

apps/recorder/src/task/config.rs

@@ -8,10 +8,10 @@ pub struct TaskConfig {
     pub subscriber_task_concurrency: u32,
     #[serde(default = "default_system_task_workers")]
     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")]
     pub cron_retry_duration: Duration,
 }
@@ -21,8 +21,9 @@ impl Default for TaskConfig {
         Self {
             subscriber_task_concurrency: default_subscriber_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(),
         }
     }
@@ -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)
 }
 
-pub fn default_system_task_timeout() -> Duration {
+pub fn default_system_task_reenqueue_orphaned_after() -> Duration {
     Duration::from_secs(3600)
 }
 

apps/recorder/src/task/service.rs

@@ -41,10 +41,10 @@ impl TaskService {
         };
 
         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 =
             ApalisPostgresStorage::new_with_config(pool.clone(), subscriber_task_storage_config);
         let system_task_storage =

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

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