LibreCloud/lib_datastores_connectors
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

chore: fix error if no id

Browse Source
This commit is contained in:
Jesús Pérez Lorenzo 2021-10-19 20:57:26 +01:00
parent 7f15375e44
commit 6469d0e041
1 changed files with 55 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
src/defs.rs
View File

@ -90,33 +90,35 @@ impl AppDataConn {
pub async fn new(name: String, stores_settings: Vec<StoreSettings>, key: &str) -> Self { pub async fn new(name: String, stores_settings: Vec<StoreSettings>, key: &str) -> Self {
let mut datastores: HashMap<String,DataPool> = HashMap::new(); let mut datastores: HashMap<String,DataPool> = HashMap::new();
for settings in stores_settings.iter() { for settings in stores_settings.iter() {
match settings.datastore { if !settings.id.is_empty() { // && datastores_settings.len() == 1usize {
DataStore::Redis => { match settings.datastore {
datastores.insert( DataStore::Redis => {
settings.id.to_owned(), datastores.insert(
DataPool::Redis(RedisPool::new(settings.to_owned()).connect_pool().await) settings.id.to_owned(),
); DataPool::Redis(RedisPool::new(settings.to_owned()).connect_pool().await)
}, );
DataStore::Mysql => { },
datastores.insert( DataStore::Mysql => {
settings.id.to_owned(), datastores.insert(
DataPool::Mysql(MysqlPool::new(settings.to_owned(),key).await.connect_pool().await) settings.id.to_owned(),
); DataPool::Mysql(MysqlPool::new(settings.to_owned(),key).await.connect_pool().await)
}, );
DataStore::Postgres => { },
datastores.insert( DataStore::Postgres => {
settings.id.to_owned(), datastores.insert(
DataPool::Postgres(PostgresPool::new(settings.to_owned(),key).await.connect_pool().await) settings.id.to_owned(),
); DataPool::Postgres(PostgresPool::new(settings.to_owned(),key).await.connect_pool().await)
}, );
DataStore::Sqlite => { },
datastores.insert( DataStore::Sqlite => {
settings.id.to_owned(), datastores.insert(
DataPool::Sqlite(SqlitePool::new(settings.to_owned()).connect_pool().await) settings.id.to_owned(),
); DataPool::Sqlite(SqlitePool::new(settings.to_owned()).connect_pool().await)
}, );
_ => continue, },
}; _ => continue,
};
}
} }
Self { Self {
name, name,
@ -174,29 +176,33 @@ impl AppDataConn {
let debug = envmnt::get_isize("DEBUG",0); let debug = envmnt::get_isize("DEBUG",0);
let mut status = false; let mut status = false;
for con in &datastores_settings { for con in &datastores_settings {
match con.datastore { if con.id.is_empty() { // && datastores_settings.len() == 1usize {
DataStore::Redis => { status = true;
status = match self.get_redis(&con.id).await { } else {
Ok(_pool) => { match con.datastore {
if debug > 0 { DataStore::Redis => {
println!("app_data_conn found redis pool"); status = match self.get_redis(&con.id).await {
} Ok(_pool) => {
true if debug > 0 {
}, println!("app_data_conn found redis pool");
Err(e) => { }
if StoreSettings::check_required_id(datastores_settings.to_owned(),&con.id) { true
panic!("Error app_data_conn required: {}",e); },
} else { Err(e) => {
println!("Error app_data_conn: {}",e); if StoreSettings::check_required_id(datastores_settings.to_owned(),&con.id) {
} panic!("Error app_data_conn required: {}",e);
false } else {
}, println!("Error app_data_conn: {}",e);
}
false
},
}
}
_ => {
continue;
} }
} };
_ => { }
continue;
}
};
} }
status status
} }