Skip to content

Commit a1c10d1

Browse files
authored
handle comm errors in script runner (#140)
1 parent 2b3561a commit a1c10d1

File tree

1 file changed

+8
-1
lines changed
  • google_metadata_script_runner

1 file changed

+8
-1
lines changed

google_metadata_script_runner/main.go

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,13 +319,20 @@ func runCmd(c *exec.Cmd, name string) error {
319319
pw.Close()
320320

321321
in := bufio.NewScanner(pr)
322-
for in.Scan() {
322+
for {
323+
if !in.Scan() {
324+
if err := in.Err(); err != nil {
325+
logger.Errorf("error while communicating with %q script: %v", name, err)
326+
}
327+
break
328+
}
323329
logger.Log(logger.LogEntry{
324330
Message: fmt.Sprintf("%s: %s", name, in.Text()),
325331
CallDepth: 3,
326332
Severity: logger.Info,
327333
})
328334
}
335+
pr.Close()
329336

330337
return c.Wait()
331338
}

0 commit comments

Comments
 (0)