opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-10 17:48:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

HTTP 304 (NotModified) is not an error!

Browse Source 
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>
This commit is contained in:
Ed Santiago
2020-02-11 15:13:03 -07:00
parent 4bdfeed5bf
commit ba30bb8409
2 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/api/handlers/containers.go
View File

@ -41,10 +41,9 @@ func StopContainer(w http.ResponseWriter, r *http.Request) {
utils.InternalServerError(w, errors.Wrapf(err, "unable to get state for Container %s", name)) utils.InternalServerError(w, errors.Wrapf(err, "unable to get state for Container %s", name))
return return
} }
// If the Container is stopped already, send a 302 // If the Container is stopped already, send a 304
if state == define.ContainerStateStopped || state == define.ContainerStateExited { if state == define.ContainerStateStopped || state == define.ContainerStateExited {
utils.Error(w, http.StatusText(http.StatusNotModified), http.StatusNotModified, utils.WriteResponse(w, http.StatusNotModified, "")
errors.Errorf("Container %s is already stopped ", name))
return return
} }
@ -134,8 +133,7 @@ func StartContainer(w http.ResponseWriter, r *http.Request) {
return return
} }
if state == define.ContainerStateRunning { if state == define.ContainerStateRunning {
msg := fmt.Sprintf("Container %s is already running", name) utils.WriteResponse(w, http.StatusNotModified, "")
utils.Error(w, msg, http.StatusNotModified, errors.New(msg))
return return
} }
if err := con.Start(r.Context(), false); err != nil { if err := con.Start(r.Context(), false); err != nil {

6
pkg/api/handlers/libpod/pods.go
View File

@ -202,8 +202,7 @@ func PodStop(w http.ResponseWriter, r *http.Request) {
} }
} }
if allContainersStopped { if allContainersStopped {
alreadyStopped := errors.Errorf("pod %s is already stopped", pod.ID()) utils.WriteResponse(w, http.StatusNotModified, "")
utils.Error(w, "Something went wrong", http.StatusNotModified, alreadyStopped)
return return
} }
@ -249,8 +248,7 @@ func PodStart(w http.ResponseWriter, r *http.Request) {
} }
} }
if allContainersRunning { if allContainersRunning {
alreadyRunning := errors.Errorf("pod %s is already running", pod.ID()) utils.WriteResponse(w, http.StatusNotModified, "")
utils.Error(w, "Something went wrong", http.StatusNotModified, alreadyRunning)
return return
} }
if _, err := pod.Start(r.Context()); err != nil { if _, err := pod.Start(r.Context()); err != nil {