diff options
| author | haircommander <pehunt@redhat.com> | 2018-08-15 11:32:23 -0400 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-08-16 20:31:50 +0000 |
| commit | a51eb1e70f3647fb5e3126a50a3458fcf486af16 (patch) | |
| tree | b21822ae0883ad831bf6cb6f5a460f3bc543cb78 /pkg | |
| parent | 8d5e0108d7c8b69abb9821bfe55475ae5d663b3a (diff) | |
| download | podman-a51eb1e70f3647fb5e3126a50a3458fcf486af16.tar.gz podman-a51eb1e70f3647fb5e3126a50a3458fcf486af16.tar.bz2 podman-a51eb1e70f3647fb5e3126a50a3458fcf486af16.zip | |
Added reason to PodContainerError
Signed-off-by: haircommander <pehunt@redhat.com>
Closes: #1275
Approved by: mheon
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/varlinkapi/pods.go | 42 |
1 files changed, 24 insertions, 18 deletions
diff --git a/pkg/varlinkapi/pods.go b/pkg/varlinkapi/pods.go index 98a622d8a..be5e3614c 100644 --- a/pkg/varlinkapi/pods.go +++ b/pkg/varlinkapi/pods.go @@ -95,9 +95,10 @@ func (i *LibpodAPI) StartPod(call iopodman.VarlinkCall, name string) error { return call.ReplyErrorOccurred(err.Error()) } if ctrErrs != nil { - containerErrs := make([]string, len(ctrErrs)) - for ctr := range ctrErrs { - containerErrs = append(containerErrs, ctr) + containerErrs := make([]iopodman.PodContainerErrorData, len(ctrErrs)) + for ctr, reason := range ctrErrs { + ctrErr := iopodman.PodContainerErrorData{Containerid: ctr, Reason: reason.Error()} + containerErrs = append(containerErrs, ctrErr) } return call.ReplyPodContainerError(pod.ID(), containerErrs) } @@ -116,9 +117,10 @@ func (i *LibpodAPI) StopPod(call iopodman.VarlinkCall, name string) error { return call.ReplyErrorOccurred(err.Error()) } if ctrErrs != nil { - containerErrs := make([]string, len(ctrErrs)) - for ctr := range ctrErrs { - containerErrs = append(containerErrs, ctr) + containerErrs := make([]iopodman.PodContainerErrorData, len(ctrErrs)) + for ctr, reason := range ctrErrs { + ctrErr := iopodman.PodContainerErrorData{Containerid: ctr, Reason: reason.Error()} + containerErrs = append(containerErrs, ctrErr) } return call.ReplyPodContainerError(pod.ID(), containerErrs) } @@ -137,9 +139,10 @@ func (i *LibpodAPI) RestartPod(call iopodman.VarlinkCall, name string) error { return call.ReplyErrorOccurred(err.Error()) } if ctrErrs != nil { - containerErrs := make([]string, len(ctrErrs)) - for ctr := range ctrErrs { - containerErrs = append(containerErrs, ctr) + containerErrs := make([]iopodman.PodContainerErrorData, len(ctrErrs)) + for ctr, reason := range ctrErrs { + ctrErr := iopodman.PodContainerErrorData{Containerid: ctr, Reason: reason.Error()} + containerErrs = append(containerErrs, ctrErr) } return call.ReplyPodContainerError(pod.ID(), containerErrs) } @@ -164,9 +167,10 @@ func (i *LibpodAPI) KillPod(call iopodman.VarlinkCall, name string, signal int64 return call.ReplyErrorOccurred(err.Error()) } if ctrErrs != nil { - containerErrs := make([]string, len(ctrErrs)) - for ctr := range ctrErrs { - containerErrs = append(containerErrs, ctr) + containerErrs := make([]iopodman.PodContainerErrorData, len(ctrErrs)) + for ctr, reason := range ctrErrs { + ctrErr := iopodman.PodContainerErrorData{Containerid: ctr, Reason: reason.Error()} + containerErrs = append(containerErrs, ctrErr) } return call.ReplyPodContainerError(pod.ID(), containerErrs) } @@ -185,9 +189,10 @@ func (i *LibpodAPI) PausePod(call iopodman.VarlinkCall, name string) error { return call.ReplyErrorOccurred(err.Error()) } if ctrErrs != nil { - containerErrs := make([]string, len(ctrErrs)) - for ctr := range ctrErrs { - containerErrs = append(containerErrs, ctr) + containerErrs := make([]iopodman.PodContainerErrorData, len(ctrErrs)) + for ctr, reason := range ctrErrs { + ctrErr := iopodman.PodContainerErrorData{Containerid: ctr, Reason: reason.Error()} + containerErrs = append(containerErrs, ctrErr) } return call.ReplyPodContainerError(pod.ID(), containerErrs) } @@ -206,9 +211,10 @@ func (i *LibpodAPI) UnpausePod(call iopodman.VarlinkCall, name string) error { return call.ReplyErrorOccurred(err.Error()) } if ctrErrs != nil { - containerErrs := make([]string, len(ctrErrs)) - for ctr := range ctrErrs { - containerErrs = append(containerErrs, ctr) + containerErrs := make([]iopodman.PodContainerErrorData, len(ctrErrs)) + for ctr, reason := range ctrErrs { + ctrErr := iopodman.PodContainerErrorData{Containerid: ctr, Reason: reason.Error()} + containerErrs = append(containerErrs, ctrErr) } return call.ReplyPodContainerError(pod.ID(), containerErrs) } |