fix: 软件安装日志兼容各种奇葩情况

tnb-labs · Feb 23, 2024 · 284f6fb · 284f6fb
1 parent 8194028
commit 284f6fb
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 12 deletions.
diff --git a/app/http/controllers/plugin_controller.go b/app/http/controllers/plugin_controller.go
@@ -129,7 +129,7 @@ func (r *PluginController) Install(ctx http.Context) http.Response {
 	var task models.Task
 	task.Name = "安装插件 " + plugin.Name
 	task.Status = models.TaskStatusWaiting
-	task.Shell = plugin.Install + " >> /tmp/" + plugin.Slug + ".log 2>&1"
+	task.Shell = plugin.Install + ` >> '/tmp/` + plugin.Slug + `.log' 2>&1`
 	task.Log = "/tmp/" + plugin.Slug + ".log"
 	if err := facades.Orm().Query().Create(&task); err != nil {
 		facades.Log().Request(ctx.Request()).Tags("面板", "插件中心").With(map[string]any{

diff --git a/app/http/controllers/plugins/php74_controller.go b/app/http/controllers/plugins/php74_controller.go
@@ -166,7 +166,7 @@ func (r *Php74Controller) InstallExtension(ctx http.Context) http.Response {
 			var task models.Task
 			task.Name = "安装PHP-" + r.version + "扩展-" + item.Name
 			task.Status = models.TaskStatusWaiting
-			task.Shell = `bash '/www/panel/scripts/php_extensions/` + item.Slug + `.sh' install ` + r.version + ` >> /tmp/` + item.Slug + `.log 2>&1`
+			task.Shell = `bash '/www/panel/scripts/php_extensions/` + item.Slug + `.sh' install ` + r.version + ` >> '/tmp/` + item.Slug + `.log' 2>&1`
 			task.Log = "/tmp/" + item.Slug + ".log"
 			if err := facades.Orm().Query().Create(&task); err != nil {
 				facades.Log().Info("[PHP-" + r.version + "] 创建安装拓展任务失败：" + err.Error())
@@ -198,7 +198,7 @@ func (r *Php74Controller) UninstallExtension(ctx http.Context) http.Response {
 			var task models.Task
 			task.Name = "卸载PHP-" + r.version + "扩展-" + item.Name
 			task.Status = models.TaskStatusWaiting
-			task.Shell = `bash '/www/panel/scripts/php_extensions/` + item.Slug + `.sh' uninstall ` + r.version + ` >> /tmp/` + item.Slug + `.log 2>&1`
+			task.Shell = `bash '/www/panel/scripts/php_extensions/` + item.Slug + `.sh' uninstall ` + r.version + ` >> '/tmp/` + item.Slug + `.log' 2>&1`
 			task.Log = "/tmp/" + item.Slug + ".log"
 			if err := facades.Orm().Query().Create(&task); err != nil {
 				facades.Log().Info("[PHP-" + r.version + "] 创建卸载拓展任务失败：" + err.Error())

diff --git a/app/http/controllers/plugins/php80_controller.go b/app/http/controllers/plugins/php80_controller.go
@@ -166,7 +166,7 @@ func (r *Php80Controller) InstallExtension(ctx http.Context) http.Response {
 			var task models.Task
 			task.Name = "安装PHP-" + r.version + "扩展-" + item.Name
 			task.Status = models.TaskStatusWaiting
-			task.Shell = `bash '/www/panel/scripts/php_extensions/` + item.Slug + `.sh' install ` + r.version + ` >> /tmp/` + item.Slug + `.log 2>&1`
+			task.Shell = `bash '/www/panel/scripts/php_extensions/` + item.Slug + `.sh' install ` + r.version + ` >> '/tmp/` + item.Slug + `.log' 2>&1`
 			task.Log = "/tmp/" + item.Slug + ".log"
 			if err := facades.Orm().Query().Create(&task); err != nil {
 				facades.Log().Info("[PHP-" + r.version + "] 创建安装拓展任务失败：" + err.Error())
@@ -198,7 +198,7 @@ func (r *Php80Controller) UninstallExtension(ctx http.Context) http.Response {
 			var task models.Task
 			task.Name = "卸载PHP-" + r.version + "扩展-" + item.Name
 			task.Status = models.TaskStatusWaiting
-			task.Shell = `bash '/www/panel/scripts/php_extensions/` + item.Slug + `.sh' uninstall ` + r.version + ` >> /tmp/` + item.Slug + `.log 2>&1`
+			task.Shell = `bash '/www/panel/scripts/php_extensions/` + item.Slug + `.sh' uninstall ` + r.version + ` >> '/tmp/` + item.Slug + `.log' 2>&1`
 			task.Log = "/tmp/" + item.Slug + ".log"
 			if err := facades.Orm().Query().Create(&task); err != nil {
 				facades.Log().Info("[PHP-" + r.version + "] 创建卸载拓展任务失败：" + err.Error())

diff --git a/app/http/controllers/plugins/php81_controller.go b/app/http/controllers/plugins/php81_controller.go
@@ -166,7 +166,7 @@ func (r *Php81Controller) InstallExtension(ctx http.Context) http.Response {
 			var task models.Task
 			task.Name = "安装PHP-" + r.version + "扩展-" + item.Name
 			task.Status = models.TaskStatusWaiting
-			task.Shell = `bash '/www/panel/scripts/php_extensions/` + item.Slug + `.sh' install ` + r.version + ` >> /tmp/` + item.Slug + `.log 2>&1`
+			task.Shell = `bash '/www/panel/scripts/php_extensions/` + item.Slug + `.sh' install ` + r.version + ` >> '/tmp/` + item.Slug + `.log' 2>&1`
 			task.Log = "/tmp/" + item.Slug + ".log"
 			if err := facades.Orm().Query().Create(&task); err != nil {
 				facades.Log().Info("[PHP-" + r.version + "] 创建安装拓展任务失败：" + err.Error())
@@ -198,7 +198,7 @@ func (r *Php81Controller) UninstallExtension(ctx http.Context) http.Response {
 			var task models.Task
 			task.Name = "卸载PHP-" + r.version + "扩展-" + item.Name
 			task.Status = models.TaskStatusWaiting
-			task.Shell = `bash '/www/panel/scripts/php_extensions/` + item.Slug + `.sh' uninstall ` + r.version + ` >> /tmp/` + item.Slug + `.log 2>&1`
+			task.Shell = `bash '/www/panel/scripts/php_extensions/` + item.Slug + `.sh' uninstall ` + r.version + ` >> '/tmp/` + item.Slug + `.log' 2>&1`
 			task.Log = "/tmp/" + item.Slug + ".log"
 			if err := facades.Orm().Query().Create(&task); err != nil {
 				facades.Log().Info("[PHP-" + r.version + "] 创建卸载拓展任务失败：" + err.Error())

diff --git a/app/http/controllers/plugins/php82_controller.go b/app/http/controllers/plugins/php82_controller.go
@@ -166,7 +166,7 @@ func (r *Php82Controller) InstallExtension(ctx http.Context) http.Response {
 			var task models.Task
 			task.Name = "安装PHP-" + r.version + "扩展-" + item.Name
 			task.Status = models.TaskStatusWaiting
-			task.Shell = `bash '/www/panel/scripts/php_extensions/` + item.Slug + `.sh' install ` + r.version + ` >> /tmp/` + item.Slug + `.log 2>&1`
+			task.Shell = `bash '/www/panel/scripts/php_extensions/` + item.Slug + `.sh' install ` + r.version + ` >> '/tmp/` + item.Slug + `.log' 2>&1`
 			task.Log = "/tmp/" + item.Slug + ".log"
 			if err := facades.Orm().Query().Create(&task); err != nil {
 				facades.Log().Info("[PHP-" + r.version + "] 创建安装拓展任务失败：" + err.Error())
@@ -198,7 +198,7 @@ func (r *Php82Controller) UninstallExtension(ctx http.Context) http.Response {
 			var task models.Task
 			task.Name = "卸载PHP-" + r.version + "扩展-" + item.Name
 			task.Status = models.TaskStatusWaiting
-			task.Shell = `bash '/www/panel/scripts/php_extensions/` + item.Slug + `.sh' uninstall ` + r.version + ` >> /tmp/` + item.Slug + `.log 2>&1`
+			task.Shell = `bash '/www/panel/scripts/php_extensions/` + item.Slug + `.sh' uninstall ` + r.version + ` >> '/tmp/` + item.Slug + `.log' 2>&1`
 			task.Log = "/tmp/" + item.Slug + ".log"
 			if err := facades.Orm().Query().Create(&task); err != nil {
 				facades.Log().Info("[PHP-" + r.version + "] 创建卸载拓展任务失败：" + err.Error())

diff --git a/app/http/controllers/plugins/php83_controller.go b/app/http/controllers/plugins/php83_controller.go
@@ -166,7 +166,7 @@ func (r *Php83Controller) InstallExtension(ctx http.Context) http.Response {
 			var task models.Task
 			task.Name = "安装PHP-" + r.version + "扩展-" + item.Name
 			task.Status = models.TaskStatusWaiting
-			task.Shell = `bash '/www/panel/scripts/php_extensions/` + item.Slug + `.sh' install ` + r.version + ` >> /tmp/` + item.Slug + `.log 2>&1`
+			task.Shell = `bash '/www/panel/scripts/php_extensions/` + item.Slug + `.sh' install ` + r.version + ` >> '/tmp/` + item.Slug + `.log' 2>&1`
 			task.Log = "/tmp/" + item.Slug + ".log"
 			if err := facades.Orm().Query().Create(&task); err != nil {
 				facades.Log().Info("[PHP-" + r.version + "] 创建安装拓展任务失败：" + err.Error())
@@ -198,7 +198,7 @@ func (r *Php83Controller) UninstallExtension(ctx http.Context) http.Response {
 			var task models.Task
 			task.Name = "卸载PHP-" + r.version + "扩展-" + item.Name
 			task.Status = models.TaskStatusWaiting
-			task.Shell = `bash '/www/panel/scripts/php_extensions/` + item.Slug + `.sh' uninstall ` + r.version + ` >> /tmp/` + item.Slug + `.log 2>&1`
+			task.Shell = `bash '/www/panel/scripts/php_extensions/` + item.Slug + `.sh' uninstall ` + r.version + ` >> '/tmp/` + item.Slug + `.log' 2>&1`
 			task.Log = "/tmp/" + item.Slug + ".log"
 			if err := facades.Orm().Query().Create(&task); err != nil {
 				facades.Log().Info("[PHP-" + r.version + "] 创建卸载拓展任务失败：" + err.Error())

diff --git a/app/http/controllers/task_controller.go b/app/http/controllers/task_controller.go
@@ -63,7 +63,7 @@ func (r *TaskController) Log(ctx http.Context) http.Response {
 		return ErrorSystem(ctx)
 	}
 
-	log, err := tools.Exec("tail -n 500 " + task.Log)
+	log, err := tools.Exec(`tail -n 500 '` + task.Log + `'`)
 	if err != nil {
 		return Error(ctx, http.StatusInternalServerError, "日志已被清理")
 	}