#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>
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,
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);
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);
#ifdef HAVE_GTOP
sysinfo_cleanup();
- cpu_cleanup();
#endif
if (log_file != DEFAULT_LOG_FILE)