geforkt von mirrored/vaultwarden
Don't print DB URL
Dieser Commit ist enthalten in:
Ursprung
9add8e19eb
Commit
12af32b9ea
3 geänderte Dateien mit 6 neuen und 11 gelöschten Zeilen
|
@ -8,10 +8,9 @@ use rocket::http::Status;
|
||||||
use rocket::request::{self, FromRequest};
|
use rocket::request::{self, FromRequest};
|
||||||
use rocket::{Outcome, Request, State};
|
use rocket::{Outcome, Request, State};
|
||||||
|
|
||||||
use std::process::Command;
|
|
||||||
use chrono::prelude::*;
|
|
||||||
use crate::error::Error;
|
use crate::error::Error;
|
||||||
|
use chrono::prelude::*;
|
||||||
|
use std::process::Command;
|
||||||
|
|
||||||
use crate::CONFIG;
|
use crate::CONFIG;
|
||||||
|
|
||||||
|
@ -35,7 +34,6 @@ pub mod schema;
|
||||||
#[path = "schemas/mysql/schema.rs"]
|
#[path = "schemas/mysql/schema.rs"]
|
||||||
pub mod schema;
|
pub mod schema;
|
||||||
|
|
||||||
|
|
||||||
/// Initializes a database pool.
|
/// Initializes a database pool.
|
||||||
pub fn init_pool() -> Pool {
|
pub fn init_pool() -> Pool {
|
||||||
let manager = ConnectionManager::new(CONFIG.database_url());
|
let manager = ConnectionManager::new(CONFIG.database_url());
|
||||||
|
@ -44,9 +42,7 @@ pub fn init_pool() -> Pool {
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn get_connection() -> Result<Connection, ConnectionError> {
|
pub fn get_connection() -> Result<Connection, ConnectionError> {
|
||||||
let url = CONFIG.database_url();
|
Connection::establish(&CONFIG.database_url())
|
||||||
println!("{}", url.to_string());
|
|
||||||
Connection::establish(&url)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Creates a back-up of the database using sqlite3
|
/// Creates a back-up of the database using sqlite3
|
||||||
|
|
|
@ -128,8 +128,8 @@ fn chain_syslog(logger: fern::Dispatch) -> fern::Dispatch {
|
||||||
}
|
}
|
||||||
|
|
||||||
fn check_db() {
|
fn check_db() {
|
||||||
let url = CONFIG.database_url();
|
|
||||||
if cfg!(feature = "sqlite") {
|
if cfg!(feature = "sqlite") {
|
||||||
|
let url = CONFIG.database_url();
|
||||||
let path = Path::new(&url);
|
let path = Path::new(&url);
|
||||||
|
|
||||||
if let Some(parent) = path.parent() {
|
if let Some(parent) = path.parent() {
|
||||||
|
@ -149,7 +149,6 @@ fn check_db() {
|
||||||
.expect("Failed to turn on WAL");
|
.expect("Failed to turn on WAL");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
println!("{}", url.to_string());
|
|
||||||
db::get_connection().expect("Can't connect to DB");
|
db::get_connection().expect("Can't connect to DB");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Laden …
In neuem Issue referenzieren