projects
/
psensor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
removed option --use-libatasmart
[psensor.git]
/
src
/
server
/
server.c
diff --git
a/src/server/server.c
b/src/server/server.c
index
e0f69bb
..
f9ddad2
100644
(file)
--- a/
src/server/server.c
+++ b/
src/server/server.c
@@
-39,9
+39,11
@@
#ifdef HAVE_GTOP
#include "sysinfo.h"
#ifdef HAVE_GTOP
#include "sysinfo.h"
-#include
"cpu.h"
+#include
<pgtop2.h>
#endif
#endif
+#include <hdd.h>
+#include <lmsensor.h>
#include <plog.h>
#include "psensor_json.h"
#include <pmutex.h>
#include <plog.h>
#include "psensor_json.h"
#include <pmutex.h>
@@
-396,7
+398,9
@@
int main(int argc, char *argv[])
psensor_init();
psensor_init();
- server_data.sensors = get_all_sensors(0, 600);
+ hddtemp_psensor_list_append(&server_data.sensors, 600);
+
+ lmsensor_psensor_list_append(&server_data.sensors, 600);
#ifdef HAVE_GTOP
server_data.cpu_usage = create_cpu_usage_sensor(600);
#ifdef HAVE_GTOP
server_data.cpu_usage = create_cpu_usage_sensor(600);
@@
-438,6
+442,8
@@
int main(int argc, char *argv[])
#endif
psensor_list_update_measures(server_data.sensors);
#endif
psensor_list_update_measures(server_data.sensors);
+ lmsensor_psensor_list_update(server_data.sensors);
+
psensor_log_measures(server_data.sensors);
pmutex_unlock(&mutex);
psensor_log_measures(server_data.sensors);
pmutex_unlock(&mutex);
@@
-458,7
+464,6
@@
int main(int argc, char *argv[])
#ifdef HAVE_GTOP
sysinfo_cleanup();
#ifdef HAVE_GTOP
sysinfo_cleanup();
- cpu_cleanup();
#endif
if (log_file != DEFAULT_LOG_FILE)
#endif
if (log_file != DEFAULT_LOG_FILE)