Skip to content

Commit c544284

Browse files
authored
Merge pull request #1562 from Mark-Simulacrum/log-request-error
Increase logging verbosity for request failure
2 parents 7fc9299 + d29e9da commit c544284

File tree

1 file changed

+16
-8
lines changed

1 file changed

+16
-8
lines changed

site/src/github.rs

+16-8
Original file line numberDiff line numberDiff line change
@@ -319,10 +319,11 @@ pub(crate) async fn pr_title(pr: u32) -> String {
319319
.ok_or_else(malformed_json_error)?
320320
.to_owned())
321321
}
322+
let request_dbg = format!("{:?}", request);
322323
match send(request).await {
323324
Ok(t) => t,
324325
Err(e) => {
325-
eprintln!("Error fetching url: {}", e);
326+
log::error!("Error fetching {}: {:?}", request_dbg, e);
326327
String::from("<UNKNOWN>")
327328
}
328329
}
@@ -335,20 +336,27 @@ fn github_request(url: &str) -> reqwest::RequestBuilder {
335336
.header("Content-Type", "application/json")
336337
.header("User-Agent", "rustc-perf");
337338
if let Some(token) = std::env::var("GITHUB_TOKEN").ok() {
338-
request = request.header("Authorization", format!("token {}", token));
339+
let mut value =
340+
reqwest::header::HeaderValue::from_str(&format!("token {}", token)).unwrap();
341+
value.set_sensitive(true);
342+
request = request.header("Authorization", value);
339343
}
340344
request
341345
}
342346

343347
async fn send_request<T: serde::de::DeserializeOwned>(
344348
request: reqwest::RequestBuilder,
345349
) -> Result<T, BoxedError> {
346-
Ok(request
347-
.send()
348-
.await?
349-
.error_for_status()?
350-
.json::<T>()
351-
.await?)
350+
let response = request.send().await?;
351+
match response.error_for_status_ref() {
352+
Ok(_) => {}
353+
Err(e) => {
354+
return Err(anyhow::anyhow!("response = {:?}", response)
355+
.context(e)
356+
.into())
357+
}
358+
}
359+
Ok(response.json::<T>().await?)
352360
}
353361

354362
fn malformed_json_error() -> String {

0 commit comments

Comments
 (0)