X-Git-Url: https://git.wpitchoune.net/gitweb/?p=psensor-pkg-ubuntu.git;a=blobdiff_plain;f=src%2Fserver%2Fserver.c;h=58625868f5f1a9c2e51aacc253407730eaeb0562;hp=297d0830e3cc870afaf9bd8dbb6bc20793b13322;hb=5c1e07fec97e34a94331b6b47e25c98f2b2e4cce;hpb=4c50d430bea4b8462b0ae7ab70baf3f538f87718

diff --git a/src/server/server.c b/src/server/server.c
index 297d083..5862586 100644
--- a/src/server/server.c
+++ b/src/server/server.c
@@ -39,9 +39,11 @@
 
 #ifdef HAVE_GTOP
 #include "sysinfo.h"
-#include "cpu.h"
+#include <pgtop2.h>
 #endif
 
+#include <hdd.h>
+#include <lmsensor.h>
 #include <plog.h>
 #include "psensor_json.h"
 #include <pmutex.h>
@@ -255,15 +257,16 @@ create_response(const char *nurl, const char *method, unsigned int *rp_code)
 		free(fpath);
 	}
 
-	if (resp) {
+	if (resp)
 		return resp;
-	} else {
-		char *page = strdup(PAGE_NOT_FOUND);
-		*rp_code = MHD_HTTP_NOT_FOUND;
 
-		return MHD_create_response_from_data
-			(strlen(page), page, MHD_YES, MHD_NO);
-	}
+	char *page = strdup(PAGE_NOT_FOUND);
+	*rp_code = MHD_HTTP_NOT_FOUND;
+
+	return MHD_create_response_from_data(strlen(page),
+					     page,
+					     MHD_YES,
+					     MHD_NO);
 }
 
 static int cbk_http_request(void *cls,
@@ -393,9 +396,9 @@ int main(int argc, char *argv[])
 
 	log_open(log_file);
 
-	psensor_init();
+	hddtemp_psensor_list_append(&server_data.sensors, 600);
 
-	server_data.sensors = get_all_sensors(0, 600);
+	lmsensor_psensor_list_append(&server_data.sensors, 600);
 
 #ifdef HAVE_GTOP
 	server_data.cpu_usage = create_cpu_usage_sensor(600);
@@ -435,7 +438,14 @@ 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);
 
 		psensor_log_measures(server_data.sensors);
 
@@ -457,7 +467,6 @@ int main(int argc, char *argv[])
 
 #ifdef HAVE_GTOP
 	sysinfo_cleanup();
-	cpu_cleanup();
 #endif
 
 	if (log_file != DEFAULT_LOG_FILE)