diff options
author | Ed Santiago <santiago@redhat.com> | 2020-02-11 15:13:03 -0700 |
---|---|---|
committer | Ed Santiago <santiago@redhat.com> | 2020-02-11 15:15:20 -0700 |
commit | ba30bb8409c20f370dfc3c5ad1351e62a523706d (patch) | |
tree | e4d93ab864b444a48cf1ba273efddddb6a2a547f /pkg/api/handlers/libpod/pods.go | |
parent | 4bdfeed5bf9c467c8ab53b392747ec722505b179 (diff) | |
download | podman-ba30bb8409c20f370dfc3c5ad1351e62a523706d.tar.gz podman-ba30bb8409c20f370dfc3c5ad1351e62a523706d.tar.bz2 podman-ba30bb8409c20f370dfc3c5ad1351e62a523706d.zip |
HTTP 304 (NotModified) is not an error!
Even after #5169, my test logs kept showing:
ERRO[0004] unable to write json: "http: request method or response status code does not allow body"
Cause: overly-helpful code trying to treat condition as an
error and include a diagnostic message. This is forbidden
per rfc2616.
This PR fixes the faulty response, as well as three others
found via:
$ ack 'Error.*NotMod' (4 hits total)
$ ack 'Error.*NoCont' (no hits)
Signed-off-by: Ed Santiago <santiago@redhat.com>
Diffstat (limited to 'pkg/api/handlers/libpod/pods.go')
-rw-r--r-- | pkg/api/handlers/libpod/pods.go | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/pkg/api/handlers/libpod/pods.go b/pkg/api/handlers/libpod/pods.go index 8fb305290..e9297d91b 100644 --- a/pkg/api/handlers/libpod/pods.go +++ b/pkg/api/handlers/libpod/pods.go @@ -202,8 +202,7 @@ func PodStop(w http.ResponseWriter, r *http.Request) { } } if allContainersStopped { - alreadyStopped := errors.Errorf("pod %s is already stopped", pod.ID()) - utils.Error(w, "Something went wrong", http.StatusNotModified, alreadyStopped) + utils.WriteResponse(w, http.StatusNotModified, "") return } @@ -249,8 +248,7 @@ func PodStart(w http.ResponseWriter, r *http.Request) { } } if allContainersRunning { - alreadyRunning := errors.Errorf("pod %s is already running", pod.ID()) - utils.Error(w, "Something went wrong", http.StatusNotModified, alreadyRunning) + utils.WriteResponse(w, http.StatusNotModified, "") return } if _, err := pod.Start(r.Context()); err != nil { |