Pārlūkot izejas kodu

enhance(nginx): use sbin path for reload and test #1206

Jacky 4 dienas atpakaļ
vecāks
revīzija
479526493e
1 mainītis faili ar 12 papildinājumiem un 2 dzēšanām
  1. 12 2
      internal/nginx/nginx.go

+ 12 - 2
internal/nginx/nginx.go

@@ -25,7 +25,11 @@ func TestConfig() (stdOut string, stdErr error) {
 	if settings.NginxSettings.TestConfigCmd != "" {
 	if settings.NginxSettings.TestConfigCmd != "" {
 		return execShell(settings.NginxSettings.TestConfigCmd)
 		return execShell(settings.NginxSettings.TestConfigCmd)
 	}
 	}
-	return execCommand("nginx", "-t")
+	sbin := GetSbinPath()
+	if sbin == "" {
+		return execCommand("nginx", "-t")
+	}
+	return execCommand(sbin, "-t")
 }
 }
 
 
 // Reload reloads the nginx
 // Reload reloads the nginx
@@ -44,7 +48,13 @@ func Reload() (stdOut string, stdErr error) {
 	if settings.NginxSettings.ReloadCmd != "" {
 	if settings.NginxSettings.ReloadCmd != "" {
 		return execShell(settings.NginxSettings.ReloadCmd)
 		return execShell(settings.NginxSettings.ReloadCmd)
 	}
 	}
-	return execCommand("nginx", "-s", "reload")
+
+	sbin := GetSbinPath()
+
+	if sbin == "" {
+		return execCommand("nginx", "-s", "reload")
+	}
+	return execCommand(sbin, "-s", "reload")
 }
 }
 
 
 func restart() {
 func restart() {