fixed hddtemp updated twice

diff --git a/src/lib/psensor.c b/src/lib/psensor.c
index 826aa47..97549ac 100644 (file)
--- a/src/lib/psensor.c
+++ b/src/lib/psensor.c
@@ -474,17 +474,6 @@ const char *psensor_type_to_unit_str(unsigned int type, int use_celsius)
        return _("N/A");
 }
 
-void psensor_list_update_measures(struct psensor **sensors)
-{
-       if (psensor_list_contains_type(sensors, SENSOR_TYPE_HDDTEMP))
-               hddtemp_psensor_list_update(sensors);
-
-#ifdef HAVE_ATASMART
-       if (psensor_list_contains_type(sensors, SENSOR_TYPE_ATASMART))
-               atasmart_psensor_list_update(sensors);
-#endif
-}
-
 void psensor_log_measures(struct psensor **sensors)
 {
        if (log_level == LOG_DEBUG)

diff --git a/src/lib/psensor.h b/src/lib/psensor.h
index 2e851a7..bfd7277 100644 (file)
--- a/src/lib/psensor.h
+++ b/src/lib/psensor.h
@@ -210,8 +210,6 @@ const char *psensor_type_to_str(unsigned int type);
 
 const char *psensor_type_to_unit_str(unsigned int type, int use_celsius);
 
-void psensor_list_update_measures(struct psensor **sensors);
-
 void psensor_init();
 
 void psensor_cleanup();

diff --git a/src/main.c b/src/main.c
index 073132a..262ffbf 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -154,8 +154,6 @@ static void *update_measures(void *data)
 
                update_psensor_values_size(sensors, cfg);
 
-               psensor_list_update_measures(sensors);
-
                lmsensor_psensor_list_update(sensors);
 #ifdef HAVE_REMOTE_SUPPORT
                remote_psensor_list_update(sensors);

diff --git a/src/server/server.c b/src/server/server.c
index f9ddad2..cb03d9a 100644 (file)
--- a/src/server/server.c
+++ b/src/server/server.c
@@ -440,7 +440,12 @@ int main(int argc, char *argv[])
                sysinfo_update(&server_data.psysinfo);
                cpu_usage_sensor_update(server_data.cpu_usage);
 #endif
-               psensor_list_update_measures(server_data.sensors);
+
+#ifdef HAVE_ATASMART
+               atasmart_psensor_list_update(server_data.sensors);
+#endif
+
+               hddtemp_psensor_list_update(server_data.sensors);
 
                lmsensor_psensor_list_update(server_data.sensors);