vividboarder/bitwarden_rs
1
0
Fork 0
mirror of https://github.com/ViViDboarder/bitwarden_rs.git synced 2024-11-22 13:16:39 +00:00
Code Issues Releases Wiki Activity

Don't print DB URL

Browse Source
This commit is contained in:
Daniel García 2019-06-02 13:35:01 +02:00
parent 9add8e19eb
commit 12af32b9ea
No known key found for this signature in database
GPG Key ID: FC8A7D14C3CD543A
3 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/db/mod.rs
View File

@ -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

2
src/db/schemas/sqlite/schema.rs
View File

@ -169,4 +169,4 @@ allow_tables_to_appear_in_same_query!(
users, users,
users_collections, users_collections,
users_organizations, users_organizations,
); );

5
src/main.rs
View File

@ -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");
} }
@ -217,7 +216,7 @@ fn check_web_vault() {
// https://docs.rs/diesel_migrations/*/diesel_migrations/macro.embed_migrations.html // https://docs.rs/diesel_migrations/*/diesel_migrations/macro.embed_migrations.html
#[allow(unused_imports)] #[allow(unused_imports)]
mod migrations { mod migrations {
#[cfg(feature = "sqlite")] #[cfg(feature = "sqlite")]
embed_migrations!("migrations/sqlite"); embed_migrations!("migrations/sqlite");
#[cfg(feature = "mysql")] #[cfg(feature = "mysql")]