From 6fa90a15e4d56b8db78c3e2b2ec0f311edd336ca Mon Sep 17 00:00:00 2001
From: 0xJacky <me@jackyu.cn>
Date: Wed, 6 Dec 2023 18:43:51 +0800
Subject: [PATCH] enhance: find out the highest log level of nginx

---
 app/src/views/domain/DomainList.vue | 3 +++
 internal/nginx/log.go               | 8 +++++---
 internal/nginx/nginx.go             | 4 +---
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/app/src/views/domain/DomainList.vue b/app/src/views/domain/DomainList.vue
index d03c23b7..00af6295 100644
--- a/app/src/views/domain/DomainList.vue
+++ b/app/src/views/domain/DomainList.vue
@@ -57,6 +57,7 @@ function enable(name: string) {
   domain.enable(name).then(() => {
     message.success($gettext('Enabled successfully'))
     table.value?.get_list()
+    inspect_config.value?.test()
   }).catch(r => {
     message.error($gettext('Failed to enable %{msg}', { msg: r.message ?? '' }), 10)
   })
@@ -66,6 +67,7 @@ function disable(name: string) {
   domain.disable(name).then(() => {
     message.success($gettext('Disabled successfully'))
     table.value?.get_list()
+    inspect_config.value?.test()
   }).catch(r => {
     message.error($gettext('Failed to disable %{msg}', { msg: r.message ?? '' }))
   })
@@ -75,6 +77,7 @@ function destroy(site_name: string) {
   domain.destroy(site_name).then(() => {
     table.value.get_list()
     message.success($gettext('Delete site: %{site_name}', { site_name }))
+    inspect_config.value?.test()
   }).catch(e => {
     message.error(e?.message ?? $gettext('Server error'))
   })
diff --git a/internal/nginx/log.go b/internal/nginx/log.go
index b99acf7c..e7afdbab 100644
--- a/internal/nginx/log.go
+++ b/internal/nginx/log.go
@@ -21,11 +21,13 @@ var logLevel = [...]string{
 	"debug", "info", "notice", "warn", "error", "crit", "alert", "emerg",
 }
 
-func GetLogLevel(output string) int {
+func GetLogLevel(output string) (level int) {
+	level = -1
 	for k, v := range logLevel {
 		if strings.Contains(output, v) {
-			return k
+			// Try to find the highest log level
+			level = k
 		}
 	}
-	return -1
+	return
 }
diff --git a/internal/nginx/nginx.go b/internal/nginx/nginx.go
index 893eafd3..d69a3607 100644
--- a/internal/nginx/nginx.go
+++ b/internal/nginx/nginx.go
@@ -9,7 +9,7 @@ import (
 )
 
 func execShell(cmd string) (out string) {
-	bytes, err := exec.Command("/bin/sh -c", cmd).CombinedOutput()
+	bytes, err := exec.Command("/bin/sh", "-c", cmd).CombinedOutput()
 	out = string(bytes)
 	if err != nil {
 		out += " " + err.Error()
@@ -60,8 +60,6 @@ func Restart() (out string) {
 
 	out += execCommand("nginx")
 
-	logger.Debug(out)
-
 	return
 }