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

feat: added custom nginx reload/restart cmd #140

Browse source
This commit is contained in:
0xJacky 2023-07-16 22:13:48 +08:00
parent cc6a325ddd
commit 01611ef622
No known key found for this signature in database
GPG key ID: B6E4A6E4A561BAF0
7 changed files with 75 additions and 144 deletions
Download patch file Download diff file Expand all files Collapse all files

54
server/internal/nginx/nginx.go
View file

@ -8,6 +8,12 @@ import (
"regexp"
)
func execShell(cmd string) (out string, err error) {
bytes, err := exec.Command("/bin/sh", "-c", cmd).CombinedOutput()
out = string(bytes)
return
}
func TestConf() string {
out, err := exec.Command("nginx", "-t").CombinedOutput()
if err != nil {
@ -18,29 +24,53 @@ func TestConf() string {
}
func Reload() string {
out, err := exec.Command("nginx", "-s", "reload").CombinedOutput()
if settings.NginxSettings.ReloadCmd != "" {
out, err := execShell(settings.NginxSettings.ReloadCmd)
if err != nil {
logger.Error(err)
if err != nil {
logger.Error(err)
}
return out
} else {
out, err := exec.Command("nginx", "-s", "reload").CombinedOutput()
if err != nil {
logger.Error(err)
}
return string(out)
}
return string(out)
}
func Restart() string {
out, err := exec.Command("nginx", "-s", "reopen").CombinedOutput()
if settings.NginxSettings.RestartCmd != "" {
out, err := execShell(settings.NginxSettings.RestartCmd)
if err != nil {
logger.Error(err)
if err != nil {
logger.Error(err)
}
return out
} else {
out, err := exec.Command("nginx", "-s", "reopen").CombinedOutput()
if err != nil {
logger.Error(err)
}
return string(out)
}
return string(out)
}
func GetConfPath(dir ...string) string {
var confPath string
if settings.ServerSettings.NginxConfigDir == "" {
if settings.NginxSettings.ConfigDir == "" {
out, err := exec.Command("nginx", "-V").CombinedOutput()
if err != nil {
logger.Error(err)
@ -54,7 +84,7 @@ func GetConfPath(dir ...string) string {
}
confPath = r.FindStringSubmatch(string(out))[1]
} else {
confPath = settings.ServerSettings.NginxConfigDir
confPath = settings.NginxSettings.ConfigDir
}
return filepath.Join(confPath, filepath.Join(dir...))
@ -63,7 +93,7 @@ func GetConfPath(dir ...string) string {
func GetNginxPIDPath() string {
var confPath string
if settings.ServerSettings.NginxPIDPath == "" {
if settings.NginxSettings.PIDPath == "" {
out, err := exec.Command("nginx", "-V").CombinedOutput()
if err != nil {
logger.Error(err)
@ -77,7 +107,7 @@ func GetNginxPIDPath() string {
}
confPath = r.FindStringSubmatch(string(out))[1]
} else {
confPath = settings.ServerSettings.NginxPIDPath
confPath = settings.NginxSettings.PIDPath
}
return confPath