matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Merge pull request #538 from jsirois/jsirois/cleanups/err_or_else

Browse source 
Cleanup `HookError` tracing logic.
This commit is contained in:
Matthias Beyer 2016-07-15 11:19:11 +02:00 committed by GitHub
commit 6a4c620c2c
1 changed files with 15 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
libimagstore/src/hook/aspect.rs
View file

@ -51,19 +51,7 @@ impl StoreIdAccessor for Aspect {
&HDA::StoreIdAccess(accessor) => accessor.access(id), &HDA::StoreIdAccess(accessor) => accessor.access(id),
_ => unreachable!(), _ => unreachable!(),
}; };
trace_hook_errors(res)
match res {
Ok(res) => Ok(res),
Err(e) => {
if !e.is_aborting() {
trace_error(&e);
// ignore error if it is not aborting, as we printed it already
Ok(())
} else {
Err(e)
}
}
}
}) })
} }
} }
@ -94,19 +82,7 @@ impl MutableHookDataAccessor for Aspect {
&HDA::NonMutableAccess(ref accessor) => accessor.access(fle), &HDA::NonMutableAccess(ref accessor) => accessor.access(fle),
_ => unreachable!(), _ => unreachable!(),
}; };
trace_hook_errors(res)
match res {
Ok(res) => Ok(res),
Err(e) => {
if !e.is_aborting() {
trace_error(&e);
// ignore error if it is not aborting, as we printed it already
Ok(())
} else {
Err(e)
}
}
}
}) })
} }
} }
@ -123,10 +99,13 @@ impl NonMutableHookDataAccessor for Aspect {
&HDA::NonMutableAccess(accessor) => accessor.access(fle), &HDA::NonMutableAccess(accessor) => accessor.access(fle),
_ => unreachable!(), _ => unreachable!(),
}; };
trace_hook_errors(res)
})
}
}
match res { fn trace_hook_errors(res: HookResult<()>) -> HookResult<()> {
Ok(res) => Ok(res), res.or_else(|e| {
Err(e) => {
if !e.is_aborting() { if !e.is_aborting() {
trace_error(&e); trace_error(&e);
// ignore error if it is not aborting, as we printed it already // ignore error if it is not aborting, as we printed it already
@ -134,9 +113,6 @@ impl NonMutableHookDataAccessor for Aspect {
} else { } else {
Err(e) Err(e)
} }
}
}
}) })
}
} }