matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Rewrite debug calls with DebugOption extension

Browse source
This commit is contained in:
Matthias Beyer 2018-11-08 15:52:03 +01:00
parent 2cb46597f7
commit a2eae99a39
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
bin/domain/imag-diary/src/create.rs
View file

@ -30,6 +30,8 @@ use libimagentryedit::edit::Edit;
use libimagrt::runtime::Runtime; use libimagrt::runtime::Runtime;
use libimagerror::trace::MapErrTrace; use libimagerror::trace::MapErrTrace;
use libimagutil::warn_exit::warn_exit; use libimagutil::warn_exit::warn_exit;
use libimagutil::debug_result::DebugResult;
use libimagutil::debug_option::DebugOption;
use libimagstore::store::FileLockEntry; use libimagstore::store::FileLockEntry;
use libimagstore::store::Store; use libimagstore::store::Store;
@ -85,10 +87,7 @@ fn create_entry<'a>(diary: &'a Store, diaryname: &str, rt: &Runtime) -> FileLock
debug!("Creating non-timed entry"); debug!("Creating non-timed entry");
diary.new_entry_today(diaryname) diary.new_entry_today(diaryname)
}) })
.map(|e| { .map_dbg(|e| format!("Created: {}", e.get_location()))
debug!("Created: {}", e.get_location());
e
})
.map_err_trace_exit_unwrap(1) .map_err_trace_exit_unwrap(1)
} }
@ -120,7 +119,7 @@ fn create_id_from_clispec(create: &ArgMatches, timed_type: Timed) -> NaiveDateTi
Timed::Minutely => { Timed::Minutely => {
let min = create let min = create
.value_of("minute") .value_of("minute")
.map(|m| { debug!("minute = {:?}", m); m }) .map_dbg(|m| format!("minute = {:?}", m))
.and_then(|s| { .and_then(|s| {
FromStr::from_str(s) FromStr::from_str(s)
.map_err(|_| warn!("Could not parse minute: '{}'", s)) .map_err(|_| warn!("Could not parse minute: '{}'", s))
@ -140,7 +139,7 @@ fn create_id_from_clispec(create: &ArgMatches, timed_type: Timed) -> NaiveDateTi
Timed::Secondly => { Timed::Secondly => {
let min = create let min = create
.value_of("minute") .value_of("minute")
.map(|m| { debug!("minute = {:?}", m); m }) .map_dbg(|m| format!("minute = {:?}", m))
.and_then(|s| { .and_then(|s| {
FromStr::from_str(s) FromStr::from_str(s)
.map_err(|_| warn!("Could not parse minute: '{}'", s)) .map_err(|_| warn!("Could not parse minute: '{}'", s))
@ -150,7 +149,7 @@ fn create_id_from_clispec(create: &ArgMatches, timed_type: Timed) -> NaiveDateTi
let sec = create let sec = create
.value_of("second") .value_of("second")
.map(|s| { debug!("second = {:?}", s); s }) .map_dbg(|s| format!("second = {:?}", s))
.and_then(|s| { .and_then(|s| {
FromStr::from_str(s) FromStr::from_str(s)
.map_err(|_| warn!("Could not parse second: '{}'", s)) .map_err(|_| warn!("Could not parse second: '{}'", s))