tornadocontrib/ web3-proxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

put rate limit things into data

This commit is contained in:
Bryan Stitt 2023-08-24 13:25:14 -07:00
parent a32e2ddcad
commit e76bef272f
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
web3_proxy/src/errors.rs
View File

@ -847,32 +847,26 @@ impl Web3ProxyError {
Self::RateLimited(authorization, retry_at) => {
// TODO: emit a stat
let retry_msg = if let Some(retry_at) = retry_at {
let retry_in = retry_at.duration_since(Instant::now()).as_secs();
format!(" Retry in {} seconds", retry_in)
let retry_after = if let Some(retry_at) = retry_at {
retry_at.duration_since(Instant::now()).as_secs()
} else {
"".to_string()
// TODO: what should we default to?
60
};
// create a string with either the IP or the rpc_key_id
let msg = if authorization.checks.rpc_secret_key_id.is_none() {
format!("too many requests from {}.{}", authorization.ip, retry_msg)
let retry_data = if authorization.checks.rpc_secret_key_id.is_none() {
json!({"retry_after": retry_after, "ip": authorization.ip})
} else {
format!(
"too many requests from rpc key #{}.{}",
authorization.checks.rpc_secret_key_id.unwrap(),
retry_msg,
)
json!({"retry_after": retry_after, "ip": authorization.ip, "key_id": authorization.checks.rpc_secret_key_id.unwrap()})
};
(
StatusCode::TOO_MANY_REQUESTS,
JsonRpcErrorData {
message: msg.into(),
message: "too many requests".into(),
code: StatusCode::TOO_MANY_REQUESTS.as_u16().into(),
// TODO: use a generic message with details in the data
data: None,
data: Some(retry_data),
},
)
}