vikarti.anatra/polaris-mirror
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Error handling for index insertions

Browse source
This commit is contained in:
Antoine Gersant 2020-01-18 22:20:59 -08:00
parent b8b3c80be9
commit f6b9e67d4e
1 changed files with 40 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/index/update.rs
View file

@ -315,10 +315,16 @@ fn insert_songs(receiver: Receiver<NewSong>, db: DB) {
Ok(s) => { Ok(s) => {
new_entries.push(s); new_entries.push(s);
if new_entries.len() >= INDEX_BUILDING_INSERT_BUFFER_SIZE { if new_entries.len() >= INDEX_BUILDING_INSERT_BUFFER_SIZE {
let connection = db.connect().unwrap(); if db.connect()
.and_then(|connection|{
diesel::insert_into(songs::table) diesel::insert_into(songs::table)
.values(&new_entries) .values(&new_entries)
.execute(&*connection).unwrap(); // TODO https://github.com/diesel-rs/diesel/issues/1822 .execute(&*connection) // TODO https://github.com/diesel-rs/diesel/issues/1822
.map_err(Error::new)
})
.is_err() {
error!("Could not insert new songs in database");
}
new_entries.clear(); new_entries.clear();
} }
}, },
@ -327,10 +333,16 @@ fn insert_songs(receiver: Receiver<NewSong>, db: DB) {
} }
if new_entries.len() > 0 { if new_entries.len() > 0 {
let connection = db.connect().unwrap(); if db.connect()
.and_then(|connection|{
diesel::insert_into(songs::table) diesel::insert_into(songs::table)
.values(&new_entries) .values(&new_entries)
.execute(&*connection).unwrap(); .execute(&*connection) // TODO https://github.com/diesel-rs/diesel/issues/1822
.map_err(Error::new)
})
.is_err() {
error!("Could not insert new songs in database");
}
} }
} }
@ -343,10 +355,16 @@ fn insert_directories(receiver: Receiver<NewDirectory>, db: DB) {
Ok(s) => { Ok(s) => {
new_entries.push(s); new_entries.push(s);
if new_entries.len() >= INDEX_BUILDING_INSERT_BUFFER_SIZE { if new_entries.len() >= INDEX_BUILDING_INSERT_BUFFER_SIZE {
let connection = db.connect().unwrap(); if db.connect()
.and_then(|connection|{
diesel::insert_into(directories::table) diesel::insert_into(directories::table)
.values(&new_entries) .values(&new_entries)
.execute(&*connection).unwrap(); // TODO https://github.com/diesel-rs/diesel/issues/1822 .execute(&*connection) // TODO https://github.com/diesel-rs/diesel/issues/1822
.map_err(Error::new)
})
.is_err() {
error!("Could not insert new directories in database");
}
new_entries.clear(); new_entries.clear();
} }
}, },
@ -355,9 +373,15 @@ fn insert_directories(receiver: Receiver<NewDirectory>, db: DB) {
} }
if new_entries.len() > 0 { if new_entries.len() > 0 {
let connection = db.connect().unwrap(); if db.connect()
.and_then(|connection|{
diesel::insert_into(directories::table) diesel::insert_into(directories::table)
.values(&new_entries) .values(&new_entries)
.execute(&*connection).unwrap(); .execute(&*connection) // TODO https://github.com/diesel-rs/diesel/issues/1822
.map_err(Error::new)
})
.is_err() {
error!("Could not insert new directories in database");
}
} }
} }