Skip to content

Commit 5f0c332

Browse files
committed
Always buffer output for logging in shellOut
1 parent 27b3b1a commit 5f0c332

File tree

1 file changed

+5
-8
lines changed

1 file changed

+5
-8
lines changed

nginx-controller/nginx/nginx.go

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -187,21 +187,18 @@ func shellOut(cmd string) {
187187
glog.Infof("executing %s", cmd)
188188

189189
command := exec.Command("sh", "-c", cmd)
190-
if glog.V(2) {
191-
command.Stdout = &stdout
192-
command.Stderr = &stderr
193-
}
190+
command.Stdout = &stdout
191+
command.Stderr = &stderr
192+
194193
err := command.Start()
195194
if err != nil {
196195
glog.Fatalf("Failed to execute %v, err: %v", cmd, err)
197196
}
198197

199198
err = command.Wait()
200199
if err != nil {
201-
if glog.V(2) {
202-
glog.Errorf("Command %v stdout: %q", cmd, stdout.String())
203-
glog.Errorf("Command %v stderr: %q", cmd, stderr.String())
204-
}
200+
glog.Errorf("Command %v stdout: %q", cmd, stdout.String())
201+
glog.Errorf("Command %v stderr: %q", cmd, stderr.String())
205202
glog.Fatalf("Command %v finished with error: %v", cmd, err)
206203
}
207204
}

0 commit comments

Comments
 (0)