lourenco/mgmt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

engine: resources: Improve logging on resource errors

Browse Source 
When a subcommand errors, it's helpful to see what it was.
This commit is contained in:
James Shubin
2023-12-03 18:32:14 -05:00
parent c3f34db81e
commit 271a94e0c7
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
engine/resources/exec.go
View File

@@ -202,6 +202,7 @@ func (obj *ExecRes) Watch(ctx context.Context) error {
ioChan := make(chan *cmdOutput) ioChan := make(chan *cmdOutput)
defer obj.wg.Wait() defer obj.wg.Wait()
var watchCmd *exec.Cmd
if obj.WatchCmd != "" { if obj.WatchCmd != "" {
var cmdName string var cmdName string
var cmdArgs []string var cmdArgs []string
@@ -227,6 +228,7 @@ func (obj *ExecRes) Watch(ctx context.Context) error {
Setpgid: true, Setpgid: true,
Pgid: 0, Pgid: 0,
} }
watchCmd = cmd // store for errors
// if we have a user and group, use them // if we have a user and group, use them
var err error var err error
@@ -268,6 +270,7 @@ func (obj *ExecRes) Watch(ctx context.Context) error {
return errwrap.Wrapf(err, "unexpected watchcmd exit status of zero") return errwrap.Wrapf(err, "unexpected watchcmd exit status of zero")
} }
obj.init.Logf("watchcmd: %s", strings.Join(watchCmd.Args, " "))
obj.init.Logf("watchcmd exited with: %d", exitStatus) obj.init.Logf("watchcmd exited with: %d", exitStatus)
return errwrap.Wrapf(err, "watchcmd errored") return errwrap.Wrapf(err, "watchcmd errored")
} }
@@ -354,6 +357,7 @@ func (obj *ExecRes) CheckApply(ctx context.Context, apply bool) (bool, error) {
return false, errwrap.Wrapf(err, "unexpected ifcmd exit status of zero") return false, errwrap.Wrapf(err, "unexpected ifcmd exit status of zero")
} }
obj.init.Logf("ifcmd: %s", strings.Join(cmd.Args, " "))
obj.init.Logf("ifcmd exited with: %d", exitStatus) obj.init.Logf("ifcmd exited with: %d", exitStatus)
if s := out.String(); s == "" { if s := out.String(); s == "" {
obj.init.Logf("ifcmd out empty!") obj.init.Logf("ifcmd out empty!")
@@ -569,6 +573,7 @@ func (obj *ExecRes) CheckApply(ctx context.Context, apply bool) (bool, error) {
return false, errwrap.Wrapf(err, "unexpected donecmd exit status of zero") return false, errwrap.Wrapf(err, "unexpected donecmd exit status of zero")
} }
obj.init.Logf("donecmd: %s", strings.Join(cmd.Args, " "))
if s := out.String(); s == "" { if s := out.String(); s == "" {
obj.init.Logf("donecmd exit status %d", exitStatus) obj.init.Logf("donecmd exit status %d", exitStatus)
} else { } else {