Cleans up non-pushd file handling.

Author: bantonj

processing_handler.go

@@ -433,20 +433,20 @@ func handleProcessing(reqID string, rw http.ResponseWriter, r *http.Request) {
 	checkErr(ctx, "processing", err)
 	checkErr(ctx, "timeout", router.CheckTimeout(ctx))
 
-	// TODO: only run this is pushd_handler used?
-
-	// copy imgData for thread safety
-	imgDataForS3 := make([]byte, len(resultData.Data))
-	copy(imgDataForS3, resultData.Data)
-	uploaded := beforeResponse(imgDataForS3, cachePath)
+	var uploaded chan bool
+	if cachePath != "" {
+		// copy imgData for thread safety
+		imgDataForS3 := make([]byte, len(resultData.Data))
+		copy(imgDataForS3, resultData.Data)
+		uploaded = beforeResponse(imgDataForS3, cachePath)
+	}
 
 	defer resultData.Close()
 
 	respondWithImage(reqID, r, rw, statusCode, resultData, po, imageURL, originData)
 
-	// Waiting for S3 Upload to finish.
-	// TODO: make this more elegant?
 	if cachePath != "" {
+		// Waiting for S3 Upload to finish.
 		<-uploaded
 	}
 }