Merge pull request #5176 from edsantiago/304_is_not_an_error

HTTP 304 (NotModified) is not an error!
containers · Feb 12, 2020 · d0452ae · d0452ae
2 parents 4bdfeed + ba30bb8
commit d0452ae
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/pkg/api/handlers/containers.go b/pkg/api/handlers/containers.go
@@ -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))
 		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 {
-		utils.Error(w, http.StatusText(http.StatusNotModified), http.StatusNotModified,
-			errors.Errorf("Container %s is already stopped ", name))
+		utils.WriteResponse(w, http.StatusNotModified, "")
 		return
 	}
 
@@ -134,8 +133,7 @@ func StartContainer(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	if state == define.ContainerStateRunning {
-		msg := fmt.Sprintf("Container %s is already running", name)
-		utils.Error(w, msg, http.StatusNotModified, errors.New(msg))
+		utils.WriteResponse(w, http.StatusNotModified, "")
 		return
 	}
 	if err := con.Start(r.Context(), false); err != nil {

diff --git 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 {