Merge pull request #81 from cjellick/send404

Return 404 status code on get and delete

Author: Craig Jellick

daemon/daemon.go

@@ -138,8 +138,12 @@ func makeHandlerFunc(method string, route string, version string, f requestHandl
 			}
 		}
 		if err := f(version, w, r, mux.Vars(r)); err != nil {
-			log.Errorf("Handler for %s %s returned error: %s", method, route, err)
-			http.Error(w, err.Error(), http.StatusBadRequest)
+			statusCode := checkForStatusCode(err)
+			if statusCode == 0 {
+				log.Errorf("Handler for %s %s returned error: %s", method, route, err)
+				statusCode = http.StatusBadRequest
+			}
+			http.Error(w, err.Error(), statusCode)
 		}
 	}
 }
@@ -379,3 +383,19 @@ func (s *daemon) getBackupOpsForVolume(volume *Volume) (BackupOperations, error)
 	}
 	return driver.BackupOps()
 }
+
+type APIError struct {
+	error      string
+	statusCode int
+}
+
+func (e APIError) Error() string {
+	return e.error
+}
+
+func checkForStatusCode(err error) int {
+	if apiError, ok := err.(APIError); ok {
+		return apiError.statusCode
+	}
+	return 0
+}

daemon/volume.go

@@ -17,6 +17,11 @@ type Volume struct {
 	DriverName string
 }
 
+var notFoundAPIError = APIError{
+	statusCode: http.StatusNotFound,
+	error:      fmt.Sprintf("Volume not found."),
+}
+
 func (s *daemon) getVolume(name string) *Volume {
 	driver, err := s.getDriverForVolume(name)
 	if err != nil {
@@ -182,7 +187,7 @@ func (s *daemon) processVolumeDelete(request *api.VolumeDeleteRequest) error {
 
 	volume := s.getVolume(name)
 	if volume == nil {
-		return fmt.Errorf("Cannot find volume %s", name)
+		return notFoundAPIError
 	}
 
 	// In the case of snapshot is not supported, snapshots would be nil
@@ -325,7 +330,7 @@ func (s *daemon) doVolumeList(version string, w http.ResponseWriter, r *http.Req
 func (s *daemon) inspectVolume(name string) ([]byte, error) {
 	volume := s.getVolume(name)
 	if volume == nil {
-		return nil, fmt.Errorf("Cannot find volume %v", name)
+		return nil, notFoundAPIError
 	}
 	resp, err := s.listVolumeInfo(volume)
 	if err != nil {