From ca504e1acc1c379ee729805a895454c23322af43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=80=97=E5=AD=90?= <i@haozi.net>
Date: Wed, 29 May 2024 21:19:39 +0800
Subject: [PATCH] feat: optimize task

---
 app/console/commands/monitoring.go |  1 -
 internal/services/php.go           |  6 ++----
 internal/services/plugin.go        |  9 +++------
 internal/services/task.go          | 12 +++++-------
 internal/task.go                   |  2 +-
 5 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/app/console/commands/monitoring.go b/app/console/commands/monitoring.go
index 62eb5808..f7dad5a2 100644
--- a/app/console/commands/monitoring.go
+++ b/app/console/commands/monitoring.go
@@ -56,7 +56,6 @@ func (receiver *Monitoring) Handle(console.Context) error {
 	}
 
 	info := tools.GetMonitoringInfo()
-
 	translate := facades.Lang(context.Background())
 
 	// 去除部分数据以减少数据库存储
diff --git a/internal/services/php.go b/internal/services/php.go
index 63768554..2caffa42 100644
--- a/internal/services/php.go
+++ b/internal/services/php.go
@@ -328,8 +328,7 @@ func (r *PHPImpl) InstallExtension(slug string) error {
 		return err
 	}
 
-	NewTaskImpl().Process(task.ID)
-	return nil
+	return NewTaskImpl().Process(task.ID)
 }
 
 func (r *PHPImpl) UninstallExtension(slug string) error {
@@ -353,8 +352,7 @@ func (r *PHPImpl) UninstallExtension(slug string) error {
 		return err
 	}
 
-	NewTaskImpl().Process(task.ID)
-	return nil
+	return NewTaskImpl().Process(task.ID)
 }
 
 func (r *PHPImpl) checkExtension(slug string) bool {
diff --git a/internal/services/plugin.go b/internal/services/plugin.go
index 4ab46817..fc19d9da 100644
--- a/internal/services/plugin.go
+++ b/internal/services/plugin.go
@@ -120,8 +120,7 @@ func (r *PluginImpl) Install(slug string) error {
 		return errors.New("创建任务失败")
 	}
 
-	r.task.Process(task.ID)
-	return nil
+	return r.task.Process(task.ID)
 }
 
 // Uninstall 卸载插件
@@ -166,8 +165,7 @@ func (r *PluginImpl) Uninstall(slug string) error {
 		return errors.New("创建任务失败")
 	}
 
-	r.task.Process(task.ID)
-	return nil
+	return r.task.Process(task.ID)
 }
 
 // Update 更新插件
@@ -212,6 +210,5 @@ func (r *PluginImpl) Update(slug string) error {
 		return errors.New("创建任务失败")
 	}
 
-	r.task.Process(task.ID)
-	return nil
+	return r.task.Process(task.ID)
 }
diff --git a/internal/services/task.go b/internal/services/task.go
index fdf59f73..79056291 100644
--- a/internal/services/task.go
+++ b/internal/services/task.go
@@ -14,12 +14,8 @@ func NewTaskImpl() *TaskImpl {
 	return &TaskImpl{}
 }
 
-func (r *TaskImpl) Process(taskID uint) {
-	err := facades.Queue().Job(&jobs.ProcessTask{}, []any{taskID}).Dispatch()
-	if err != nil {
-		facades.Log().Info("[面板][TaskService] 运行任务失败: " + err.Error())
-		return
-	}
+func (r *TaskImpl) Process(taskID uint) error {
+	return facades.Queue().Job(&jobs.ProcessTask{}, []any{taskID}).Dispatch()
 }
 
 func (r *TaskImpl) DispatchWaiting() error {
@@ -29,7 +25,9 @@ func (r *TaskImpl) DispatchWaiting() error {
 	}
 
 	for _, task := range tasks {
-		r.Process(task.ID)
+		if err := r.Process(task.ID); err != nil {
+			return err
+		}
 	}
 
 	return nil
diff --git a/internal/task.go b/internal/task.go
index 77b3c70d..8a2747d7 100644
--- a/internal/task.go
+++ b/internal/task.go
@@ -1,6 +1,6 @@
 package internal
 
 type Task interface {
-	Process(taskID uint)
+	Process(taskID uint) error
 	DispatchWaiting() error
 }