Replace trace_error() with trace_error_exit() where appropriate

4 files changed, 11 insertions, 14 deletions

diff --git a/imag-counter/src/create.rs b/imag-counter/src/create.rs
index 22a38b34..a86f0c0a 100644
--- a/imag-counter/src/create.rs
+++ b/imag-counter/src/create.rs
@@ -2,7 +2,7 @@ use std::str::FromStr;
 use std::process::exit;
 
 use libimagrt::runtime::Runtime;
-use libimagerror::trace::trace_error;
+use libimagerror::trace::trace_error_exit;
 use libimagcounter::counter::Counter;
 
 pub fn create(rt: &Runtime) {
@@ -20,8 +20,7 @@ pub fn create(rt: &Runtime) {
             match Counter::new(rt.store(), String::from(name), init) {
                 Err(e) => {
                     warn!("Could not create Counter '{}' with initial value '{}'", name, init);
-                    trace_error(&e);
-                    exit(1);
+                    trace_error_exit(&e, 1);
                 },
                 Ok(_) => info!("Created Counter '{}' with initial value '{}'", name, init),
             }
diff --git a/imag-counter/src/delete.rs b/imag-counter/src/delete.rs
index 4d7e6067..c8b782ef 100644
--- a/imag-counter/src/delete.rs
+++ b/imag-counter/src/delete.rs
@@ -1,7 +1,7 @@
 use std::process::exit;
 
 use libimagrt::runtime::Runtime;
-use libimagerror::trace::trace_error;
+use libimagerror::trace::trace_error_exit;
 use libimagcounter::counter::Counter;
 
 pub fn delete(rt: &Runtime) {
@@ -13,8 +13,7 @@ pub fn delete(rt: &Runtime) {
             let name = String::from(scmd.value_of("name").unwrap()); // safe because clap enforces
 
             if let Err(e) = Counter::delete(name, rt.store()) {
-                trace_error(&e);
-                exit(1);
+                trace_error_exit(&e, 1);
             }
 
             info!("Ok");
diff --git a/imag-counter/src/interactive.rs b/imag-counter/src/interactive.rs
index e07d8e1d..4dbb810d 100644
--- a/imag-counter/src/interactive.rs
+++ b/imag-counter/src/interactive.rs
@@ -10,7 +10,7 @@ use libimagcounter::counter::Counter;
 use libimagcounter::error::CounterError;
 use libimagrt::runtime::Runtime;
 use libimagutil::key_value_split::IntoKeyValue;
-use libimagerror::trace::trace_error;
+use libimagerror::trace::{trace_error, trace_error_exit};
 
 type Result<T> = RResult<T, CounterError>;
 
@@ -47,8 +47,7 @@ pub fn interactive(rt: &Runtime) {
 
         let mut input = String::new();
         if let Err(e) = stdin().read_line(&mut input) {
-            trace_error(&e);
-            exit(1);
+            trace_error_exit(&e, 1);
         }
 
         let cont = if !input.is_empty() {
diff --git a/imag-counter/src/main.rs b/imag-counter/src/main.rs
index 76dcc00c..304bbb5e 100644
--- a/imag-counter/src/main.rs
+++ b/imag-counter/src/main.rs
@@ -27,7 +27,7 @@ use std::str::FromStr;
 
 use libimagrt::setup::generate_runtime_setup;
 use libimagcounter::counter::Counter;
-use libimagerror::trace::trace_error;
+use libimagerror::trace::{trace_error, trace_error_exit};
 use libimagutil::key_value_split::IntoKeyValue;
 
 mod create;
@@ -75,7 +75,7 @@ fn main() {
                         Counter::load(String::from(name), rt.store())
                             .map(|mut counter| {
                                 match counter.inc() {
-                                    Err(e) => { trace_error(&e); exit(1); },
+                                    Err(e) => trace_error_exit(&e, 1),
                                     Ok(_) => info!("Ok"),
                                 }
                             })
@@ -84,7 +84,7 @@ fn main() {
                         Counter::load(String::from(name), rt.store())
                             .map(|mut counter| {
                                 match counter.dec() {
-                                    Err(e) => { trace_error(&e); exit(1); },
+                                    Err(e) => trace_error_exit(&e, 1),
                                     Ok(_) => info!("Ok"),
                                 }
                             })
@@ -93,7 +93,7 @@ fn main() {
                         Counter::load(String::from(name), rt.store())
                             .map(|mut counter| {
                                 match counter.reset() {
-                                    Err(e) => { trace_error(&e); exit(1); },
+                                    Err(e) => trace_error_exit(&e, 1),
                                     Ok(_) => info!("Ok"),
                                 }
                             })
@@ -114,7 +114,7 @@ fn main() {
                         Counter::load(String::from(key), rt.store())
                             .map(|mut counter| {
                                 match counter.set(value) {
-                                    Err(e) => { trace_error(&e); exit(1); },
+                                    Err(e) => trace_error_exit(&e, 1),
                                     Ok(_) => info!("Ok"),
                                 }
                             })