cleanups

[lib1wire.git] / src / W1Device.cc

diff --git a/src/W1Device.cc b/src/W1Device.cc
index 84f4fecb9c78eff856bec0ee160b712f4b2da35a..eb94b24b3039ed611d17f5ba6d2692441b3835bb 100644 (file)
--- a/src/W1Device.cc
+++ b/src/W1Device.cc
@@ -48,7 +48,7 @@ W1Device::W1Device(string device_id_param,
 }
 
 W1Device::~W1Device() {
-       log_debug("W1Device destructor\n");
+       log_debug("started\n");
        save_and_clean_cache();
        if (reader != NULL) {
                delete(reader);
@@ -114,21 +114,18 @@ Data *W1Device::get_data() {
        Data            *ret_val;
        vector<double>  *vect;
 
-       log_debug("get_data() started\n");
        ret_val = NULL;
        vect    = get_raw_data();
        if (vect != NULL) {
-               log_debug("get_data() got raw data\n");
                ret_val = new Data(vect, get_unit());
                cache(ret_val);
                delete(vect);
-               log_debug("get_data() got raw data done\n");
+               log_debug("%s returning new data\n", id.c_str());
        }
        else {
-               log_debug("get_data() try to read old already saved data\n");
-               // read old data already saved
+               // read old already saved data
+               log_debug("%s returning old saved data\n", id.c_str());
                ret_val = reader->get_latest_data();
-               log_debug("get_data() try to read old already saved data done\n");
        }
        return ret_val;
 }
@@ -158,7 +155,7 @@ void W1Device::save_and_clean_cache() {
 
        dec_precision   = get_data_decimal_precision();
        pthread_mutex_lock(&plock);
-       log_debug("save_and_clean_cache(): memory cache size: %d\n", memory_cache.size());
+       log_debug("memory cache size: %d\n", memory_cache.size());
        StoreDay::save(id, &memory_cache, dec_precision);
        while(memory_cache.empty() == false) {
                data    = memory_cache.back();