vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

execsync: return proper error description

Browse source 
The gprc execsync client call doesn't populate `ExecSyncResponse` on
error at all. You just get an error.
This patch modifies the code to include command's streams, exit code
and error direcly into the error. `ocic` will then print useful
infomation in the cli, otherwise it won't.

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
This commit is contained in:
Antonio Murdaca 2016-11-24 10:57:10 +01:00
parent 2e3ad167bb
commit cbe2a68ce5
No known key found for this signature in database
GPG key ID: B2BEAD150DE936B9
3 changed files with 79 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

5
server/container_execsync.go
View file

@ -32,6 +32,9 @@ func (s *Server) ExecSync(ctx context.Context, req *pb.ExecSyncRequest) (*pb.Exe
}
execResp, err := s.runtime.ExecSync(c, cmd, req.GetTimeout())
if err != nil {
return nil, err
}
resp := &pb.ExecSyncResponse{
Stdout: execResp.Stdout,
Stderr: execResp.Stderr,
@ -39,5 +42,5 @@ func (s *Server) ExecSync(ctx context.Context, req *pb.ExecSyncRequest) (*pb.Exe
}
logrus.Debugf("ExecSyncResponse: %+v", resp)
return resp, err
return resp, nil
}