mirrors/nginx-ui
1
0
Fork 0
mirror of https://github.com/0xJacky/nginx-ui.git synced 2025-05-11 02:15:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

enhance: find out the highest log level of nginx

Browse source
This commit is contained in:
0xJacky 2023-12-06 18:43:51 +08:00
parent b6cbc34e6f
commit 6fa90a15e4
No known key found for this signature in database
GPG key ID: B6E4A6E4A561BAF0
3 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/src/views/domain/DomainList.vue
View file

@ -57,6 +57,7 @@ function enable(name: string) {
domain.enable(name).then(() => { domain.enable(name).then(() => {
message.success($gettext('Enabled successfully')) message.success($gettext('Enabled successfully'))
table.value?.get_list() table.value?.get_list()
inspect_config.value?.test()
}).catch(r => { }).catch(r => {
message.error($gettext('Failed to enable %{msg}', { msg: r.message ?? '' }), 10) message.error($gettext('Failed to enable %{msg}', { msg: r.message ?? '' }), 10)
}) })
@ -66,6 +67,7 @@ function disable(name: string) {
domain.disable(name).then(() => { domain.disable(name).then(() => {
message.success($gettext('Disabled successfully')) message.success($gettext('Disabled successfully'))
table.value?.get_list() table.value?.get_list()
inspect_config.value?.test()
}).catch(r => { }).catch(r => {
message.error($gettext('Failed to disable %{msg}', { msg: r.message ?? '' })) message.error($gettext('Failed to disable %{msg}', { msg: r.message ?? '' }))
}) })
@ -75,6 +77,7 @@ function destroy(site_name: string) {
domain.destroy(site_name).then(() => { domain.destroy(site_name).then(() => {
table.value.get_list() table.value.get_list()
message.success($gettext('Delete site: %{site_name}', { site_name })) message.success($gettext('Delete site: %{site_name}', { site_name }))
inspect_config.value?.test()
}).catch(e => { }).catch(e => {
message.error(e?.message ?? $gettext('Server error')) message.error(e?.message ?? $gettext('Server error'))
}) })

8
internal/nginx/log.go
View file

@ -21,11 +21,13 @@ var logLevel = [...]string{
"debug", "info", "notice", "warn", "error", "crit", "alert", "emerg", "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 { for k, v := range logLevel {
if strings.Contains(output, v) { if strings.Contains(output, v) {
return k // Try to find the highest log level
level = k
} }
} }
return -1 return
} }

4
internal/nginx/nginx.go
View file

@ -9,7 +9,7 @@ import (
) )
func execShell(cmd string) (out string) { 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) out = string(bytes)
if err != nil { if err != nil {
out += " " + err.Error() out += " " + err.Error()
@ -60,8 +60,6 @@ func Restart() (out string) {
out += execCommand("nginx") out += execCommand("nginx")
logger.Debug(out)
return return
} }