eightequal/AstralRinth
1
0
Fork 0
forked from didirus/AstralRinth
Code Pull Requests Activity

Attempt to fix db timeouts (#674)

Browse Source
This commit is contained in:
Geometrically
2023-08-07 12:37:29 -07:00
committed by GitHub
parent 4b07ee2fa8
commit f21c756793
2 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/database/models/project_item.rs
View File

@@ -10,7 +10,7 @@ use serde::{Deserialize, Serialize};
const PROJECTS_NAMESPACE: &str = "projects"; const PROJECTS_NAMESPACE: &str = "projects";
const PROJECTS_SLUGS_NAMESPACE: &str = "projects_slugs"; const PROJECTS_SLUGS_NAMESPACE: &str = "projects_slugs";
const PROJECTS_DEPENDENCIES_NAMESPACE: &str = "projects_dependencies"; const PROJECTS_DEPENDENCIES_NAMESPACE: &str = "projects_dependencies";
const DEFAULT_EXPIRY: i64 = 1800; // 30 minutes const DEFAULT_EXPIRY: i64 = 3600; // 60 minutes
#[derive(Clone, Debug, Serialize, Deserialize)] #[derive(Clone, Debug, Serialize, Deserialize)]
pub struct DonationUrl { pub struct DonationUrl {

44
src/main.rs
View File

@@ -134,7 +134,7 @@ async fn main() -> std::io::Result<()> {
// Changes statuses of scheduled projects/versions // Changes statuses of scheduled projects/versions
let pool_ref = pool.clone(); let pool_ref = pool.clone();
// TODO: Clear cache when these are run // TODO: Clear cache when these are run
scheduler.run(std::time::Duration::from_secs(60), move || { scheduler.run(std::time::Duration::from_secs(60 * 5), move || {
let pool_ref = pool_ref.clone(); let pool_ref = pool_ref.clone();
info!("Releasing scheduled versions/projects!"); info!("Releasing scheduled versions/projects!");
@@ -247,7 +247,7 @@ async fn main() -> std::io::Result<()> {
let pool_ref = pool.clone(); let pool_ref = pool.clone();
let download_queue_ref = download_queue.clone(); let download_queue_ref = download_queue.clone();
scheduler.run(std::time::Duration::from_secs(30), move || { scheduler.run(std::time::Duration::from_secs(60 * 5), move || {
let pool_ref = pool_ref.clone(); let pool_ref = pool_ref.clone();
let download_queue_ref = download_queue_ref.clone(); let download_queue_ref = download_queue_ref.clone();
@@ -266,7 +266,7 @@ async fn main() -> std::io::Result<()> {
let pool_ref = pool.clone(); let pool_ref = pool.clone();
let redis_ref = redis_pool.clone(); let redis_ref = redis_pool.clone();
let session_queue_ref = session_queue.clone(); let session_queue_ref = session_queue.clone();
scheduler.run(std::time::Duration::from_secs(60), move || { scheduler.run(std::time::Duration::from_secs(60 * 30), move || {
let pool_ref = pool_ref.clone(); let pool_ref = pool_ref.clone();
let redis_ref = redis_ref.clone(); let redis_ref = redis_ref.clone();
let session_queue_ref = session_queue_ref.clone(); let session_queue_ref = session_queue_ref.clone();
@@ -324,25 +324,25 @@ async fn main() -> std::io::Result<()> {
}); });
} }
{ // {
let pool_ref = pool.clone(); // let pool_ref = pool.clone();
let redis_ref = redis_pool.clone(); // let redis_ref = redis_pool.clone();
let client_ref = clickhouse.clone(); // let client_ref = clickhouse.clone();
scheduler.run(std::time::Duration::from_secs(60 * 60 * 6), move || { // scheduler.run(std::time::Duration::from_secs(60 * 60 * 6), move || {
let pool_ref = pool_ref.clone(); // let pool_ref = pool_ref.clone();
let redis_ref = redis_ref.clone(); // let redis_ref = redis_ref.clone();
let client_ref = client_ref.clone(); // let client_ref = client_ref.clone();
//
async move { // async move {
info!("Done running payouts"); // info!("Done running payouts");
let result = process_payout(&pool_ref, &redis_ref, &client_ref).await; // let result = process_payout(&pool_ref, &redis_ref, &client_ref).await;
if let Err(e) = result { // if let Err(e) = result {
warn!("Payouts run failed: {:?}", e); // warn!("Payouts run failed: {:?}", e);
} // }
info!("Done running payouts"); // info!("Done running payouts");
} // }
}); // });
} // }
let ip_salt = Pepper { let ip_salt = Pepper {
pepper: models::ids::Base62Id(models::ids::random_base62(11)).to_string(), pepper: models::ids::Base62Id(models::ids::random_base62(11)).to_string(),