- Added upstream objects

- Renamed host templates to nginx templates
- Generate upstream templates
- Better nginx error reporting when reloading
- Use tparse for golang test reporting
This commit is contained in:
Jamie Curnow
2023-01-04 15:36:56 +10:00
parent b3ae2f4dbb
commit 5e5f0de0e2
82 changed files with 2209 additions and 294 deletions

View File

@ -7,9 +7,8 @@ import (
"npm/internal/logger"
)
func reloadNginx() error {
_, err := shExec([]string{"-s", "reload"})
return err
func reloadNginx() (string, error) {
return shExec([]string{"-s", "reload"})
}
func getNginxFilePath() (string, error) {
@ -32,7 +31,7 @@ func shExec(args []string) (string, error) {
// nolint: gosec
c := exec.Command(ng, args...)
b, e := c.Output()
b, e := c.CombinedOutput()
if e != nil {
logger.Error("NginxError", fmt.Errorf("Command error: %s -- %v\n%+v", ng, args, e))