tshakah/attic
0
0
Fork 0
forked from nrabulinski/attic
Code Pull requests Activity

Revert "server: Allow configuring max database connections"

Browse source 
Causes issues with SQLite. To be investigated further.

This reverts commit 9fdec3397d.
This commit is contained in:
Zhaofeng Li 2023-02-11 01:42:14 -07:00
parent 1710a33eca
commit 863f8dcca3
2 changed files with 2 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
server/src/config.rs
View file

@ -129,10 +129,6 @@ pub struct DatabaseConfig {
/// If enabled, a heartbeat query will be sent every minute.
#[serde(default = "default_db_heartbeat")]
pub heartbeat: bool,
/// The maximum number of concurrent connections to maintain.
#[serde(default = "default_db_max_connections")]
pub max_connections: u32,
}
/// File storage configuration.
@ -319,10 +315,6 @@ fn default_db_heartbeat() -> bool {
false
}
fn default_db_max_connections() -> u32 {
20
}
fn default_soft_delete_caches() -> bool {
false
}

8
server/src/lib.rs
View file

@ -37,7 +37,7 @@ use axum::{
http::{uri::Scheme, Uri},
Router,
};
use sea_orm::{query::Statement, ConnectionTrait, ConnectOptions, Database, DatabaseConnection};
use sea_orm::{query::Statement, ConnectionTrait, Database, DatabaseConnection};
use tokio::sync::OnceCell;
use tokio::time;
use tower_http::catch_panic::CatchPanicLayer;
@ -105,11 +105,7 @@ impl StateInner {
async fn database(&self) -> ServerResult<&DatabaseConnection> {
self.database
.get_or_try_init(|| async {
let options = ConnectOptions::new(self.config.database.url.to_owned())
.max_connections(self.config.database.max_connections)
.to_owned();
Database::connect(options)
Database::connect(&self.config.database.url)
.await
.map_err(ServerError::database_error)
})