Log when a file is not served because it was too big

Author: jyn514

src/storage/s3.rs

@@ -103,7 +103,9 @@ impl S3Backend {
                 .ok_or_else(|| failure::err_msg("Received a response from S3 with no body"))?;
 
             while let Some(data) = body.next().await.transpose()? {
-                content.write_all(data.as_ref())?;
+                if let Err(err) = content.write_all(data.as_ref()) {
+                    return Err(Error::from(err).context("file too large; refusing to serve").into());
+                }
             }
 
             let date_updated = parse_timespec(&res.last_modified.unwrap())?;

src/web/rustdoc.rs

@@ -298,18 +298,20 @@ pub fn rustdoc_html_server_handler(req: &mut Request) -> IronResult<Response> {
     }
 
     // Attempt to load the file from the database
-    let file = if let Ok(file) = File::from_path(&storage, &path, &config) {
-        file
-    } else {
-        // If it fails, we try again with /index.html at the end
-        path.push_str("/index.html");
-        req_path.push("index.html");
-
-        return if ctry!(req, storage.exists(&path)) {
-            redirect(&name, &version, &req_path[3..])
-        } else {
-            Err(IronError::new(Nope::ResourceNotFound, status::NotFound))
-        };
+    let file = match File::from_path(&storage, &path, &config) {
+        Ok(file) => file,
+        Err(err) => {
+            log::debug!("got error serving {}: {}", path, err);
+            // If it fails, we try again with /index.html at the end
+            path.push_str("/index.html");
+            req_path.push("index.html");
+
+            return if ctry!(req, storage.exists(&path)) {
+                redirect(&name, &version, &req_path[3..])
+            } else {
+                Err(IronError::new(Nope::ResourceNotFound, status::NotFound))
+            };
+        }
     };
 
     // Serve non-html files directly