Merge branch 'master' into alewis/delay-kv-bulk-delete

src/commands/dev/mod.rs

@@ -97,13 +97,13 @@ async fn serve(
     // create a closure that hyper will use later to handle HTTP requests
     let make_service = make_service_fn(move |_| {
         let client = client.to_owned();
-        let preview_id = preview_id.lock().unwrap().to_owned();
         let server_config = server_config.to_owned();
+        let preview_id = preview_id.to_owned();
         async move {
             Ok::<_, failure::Error>(service_fn(move |req| {
                 let client = client.to_owned();
-                let preview_id = preview_id.to_owned();
                 let server_config = server_config.to_owned();
+                let preview_id = preview_id.lock().unwrap().to_owned();
                 let version = req.version();
                 let (parts, body) = req.into_parts();
                 let req_method = parts.method.to_string();
@@ -196,7 +196,7 @@ pub fn get_preview_id(
     verbose: bool,
 ) -> Result<String, failure::Error> {
     let sites_preview = false;
-    let script_id = upload(&mut target, user.as_ref(), sites_preview, verbose)?;
+    let script_id = upload(&mut target, user.as_ref(), sites_preview, verbose).map_err(|_| failure::format_err!("Could not upload your script. Check your internet connection or https://www.cloudflarestatus.com/ for rare incidents impacting the Cloudflare Workers API."))?;
     Ok(format!(
         "{}{}{}{}",
         &script_id,