mirror of
https://github.com/ViViDboarder/bitwarden_rs.git
synced 2024-12-22 19:47:45 +00:00
Don't print DB URL
This commit is contained in:
parent
9add8e19eb
commit
12af32b9ea
@ -8,10 +8,9 @@ use rocket::http::Status;
|
||||
use rocket::request::{self, FromRequest};
|
||||
use rocket::{Outcome, Request, State};
|
||||
|
||||
use std::process::Command;
|
||||
use chrono::prelude::*;
|
||||
use crate::error::Error;
|
||||
|
||||
use chrono::prelude::*;
|
||||
use std::process::Command;
|
||||
|
||||
use crate::CONFIG;
|
||||
|
||||
@ -35,7 +34,6 @@ pub mod schema;
|
||||
#[path = "schemas/mysql/schema.rs"]
|
||||
pub mod schema;
|
||||
|
||||
|
||||
/// Initializes a database pool.
|
||||
pub fn init_pool() -> Pool {
|
||||
let manager = ConnectionManager::new(CONFIG.database_url());
|
||||
@ -44,9 +42,7 @@ pub fn init_pool() -> Pool {
|
||||
}
|
||||
|
||||
pub fn get_connection() -> Result<Connection, ConnectionError> {
|
||||
let url = CONFIG.database_url();
|
||||
println!("{}", url.to_string());
|
||||
Connection::establish(&url)
|
||||
Connection::establish(&CONFIG.database_url())
|
||||
}
|
||||
|
||||
/// Creates a back-up of the database using sqlite3
|
||||
|
@ -169,4 +169,4 @@ allow_tables_to_appear_in_same_query!(
|
||||
users,
|
||||
users_collections,
|
||||
users_organizations,
|
||||
);
|
||||
);
|
||||
|
@ -128,8 +128,8 @@ fn chain_syslog(logger: fern::Dispatch) -> fern::Dispatch {
|
||||
}
|
||||
|
||||
fn check_db() {
|
||||
let url = CONFIG.database_url();
|
||||
if cfg!(feature = "sqlite") {
|
||||
let url = CONFIG.database_url();
|
||||
let path = Path::new(&url);
|
||||
|
||||
if let Some(parent) = path.parent() {
|
||||
@ -149,7 +149,6 @@ fn check_db() {
|
||||
.expect("Failed to turn on WAL");
|
||||
}
|
||||
}
|
||||
println!("{}", url.to_string());
|
||||
db::get_connection().expect("Can't connect to DB");
|
||||
}
|
||||
|
||||
@ -217,7 +216,7 @@ fn check_web_vault() {
|
||||
// https://docs.rs/diesel_migrations/*/diesel_migrations/macro.embed_migrations.html
|
||||
#[allow(unused_imports)]
|
||||
mod migrations {
|
||||
|
||||
|
||||
#[cfg(feature = "sqlite")]
|
||||
embed_migrations!("migrations/sqlite");
|
||||
#[cfg(feature = "mysql")]
|
||||
|
Loading…
Reference in New Issue
Block a user