matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

libimagcounter: Rewrite error handling

Browse source
This commit is contained in:
Matthias Beyer 2017-09-03 16:09:55 +02:00
parent c9dbf76395
commit 31dc0eebc2
3 changed files with 23 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
lib/domain/libimagcounter/src/counter.rs
View file

@ -38,7 +38,7 @@ use module_path::ModuleEntryPath;
use result::Result;
use error::CounterError as CE;
use error::CounterErrorKind as CEK;
use error::error::MapErrInto;
use error::ResultExt;
pub type CounterName = String;
@ -71,8 +71,8 @@ impl<'a> Counter<'a> {
let fle = {
let id = try!(ModuleEntryPath::new(name.clone())
.into_storeid()
.map_err_into(CEK::StoreWriteError));
let mut lockentry = try!(store.create(id).map_err_into(CEK::StoreWriteError));
.chain_err(|| CEK::StoreWriteError));
let mut lockentry = try!(store.create(id).chain_err(|| CEK::StoreWriteError));
{
let entry = lockentry.deref_mut();
@ -116,26 +116,26 @@ impl<'a> Counter<'a> {
pub fn inc(&mut self) -> Result<()> {
let header = self.fle.deref_mut().get_header_mut();
let query = String::from("counter.value");
match try!(header.read(&query).map_err_into(CEK::StoreReadError)) {
match try!(header.read(&query).chain_err(|| CEK::StoreReadError)) {
Some(&Value::Integer(i)) => {
header.set(&query, Value::Integer(i + 1))
.map_err_into(CEK::StoreWriteError)
.chain_err(|| CEK::StoreWriteError)
.map(|_| ())
},
_ => Err(CE::new(CEK::StoreReadError, None)),
_ => Err(CE::from_kind(CEK::StoreReadError)),
}
}
pub fn dec(&mut self) -> Result<()> {
let header = self.fle.deref_mut().get_header_mut();
let query = String::from("counter.value");
match try!(header.read(&query).map_err_into(CEK::StoreReadError)) {
match try!(header.read(&query).chain_err(|| CEK::StoreReadError)) {
Some(&Value::Integer(i)) => {
header.set(&query, Value::Integer(i - 1))
.map_err_into(CEK::StoreWriteError)
.chain_err(|| CEK::StoreWriteError)
.map(|_| ())
},
_ => Err(CE::new(CEK::StoreReadError, None)),
_ => Err(CE::from_kind(CEK::StoreReadError)),
}
}
@ -148,7 +148,7 @@ impl<'a> Counter<'a> {
.deref_mut()
.get_header_mut()
.set(&String::from("counter.value"), Value::Integer(v))
.map_err_into(CEK::StoreWriteError)
.chain_err(|| CEK::StoreWriteError)
.map(|_| ())
}
@ -187,7 +187,7 @@ impl<'a> Counter<'a> {
self.fle
.get_header()
.read(&String::from(name))
.map_err_into(CEK::StoreWriteError)
.chain_err(|| CEK::StoreWriteError)
.and_then(f)
}
@ -195,7 +195,7 @@ impl<'a> Counter<'a> {
debug!("Loading counter: '{}'", name);
let id = try!(ModuleEntryPath::new(name)
.into_storeid()
.map_err_into(CEK::StoreWriteError));
.chain_err(|| CEK::StoreWriteError));
Counter::from_storeid(store, id)
}
@ -203,14 +203,14 @@ impl<'a> Counter<'a> {
debug!("Deleting counter: '{}'", name);
let id = try!(ModuleEntryPath::new(name)
.into_storeid()
.map_err_into(CEK::StoreWriteError));
store.delete(id).map_err_into(CEK::StoreWriteError)
.chain_err(|| CEK::StoreWriteError));
store.delete(id).chain_err(|| CEK::StoreWriteError)
}
pub fn all_counters(store: &Store) -> Result<CounterIterator> {
store.retrieve_for_module("counter")
.map(|iter| CounterIterator::new(store, iter))
.map_err_into(CEK::StoreReadError)
.chain_err(|| CEK::StoreReadError)
}
}
@ -224,11 +224,11 @@ impl<'a> FromStoreId for Counter<'a> {
fn from_storeid(store: &Store, id: StoreId) -> Result<Counter> {
debug!("Loading counter from storeid: '{:?}'", id);
match store.retrieve(id) {
Err(e) => Err(CE::new(CEK::StoreReadError, Some(Box::new(e)))),
Err(e) => Err(e).chain_err(|| CEK::StoreReadError),
Ok(c) => {
let mut counter = Counter { fle: c, unit: None };
counter.read_unit()
.map_err_into(CEK::StoreReadError)
.chain_err(|| CEK::StoreReadError)
.and_then(|u| {
counter.unit = u;
Ok(counter)

9
lib/domain/libimagcounter/src/error.rs
View file

@ -17,6 +17,10 @@
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
//
use std::error::Error;
use libimagerror::into::IntoError;
error_chain! {
types {
CounterError, CounterErrorKind, ResultExt, Result;
@ -51,9 +55,6 @@ error_chain! {
}
}
pub use self::error::CounterError;
pub use self::error::CounterErrorKind;
impl IntoError for CounterErrorKind {
type Target = CounterError;
@ -61,7 +62,7 @@ impl IntoError for CounterErrorKind {
CounterError::from_kind(self)
}
fn into_error_with_cause(self, cause: Box<Error>) -> Self::Target {
fn into_error_with_cause(self, _: Box<Error>) -> Self::Target {
CounterError::from_kind(self)
}
}

2
lib/domain/libimagcounter/src/lib.rs
View file

@ -41,7 +41,7 @@ extern crate toml_query;
#[macro_use] extern crate error_chain;
#[macro_use] extern crate libimagstore;
#[macro_use] extern crate libimagerror;
extern crate libimagerror;
module_entry_path_mod!("counter");