projects
/
psensor-pkg-ubuntu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Upstream version 1.1.2
[psensor-pkg-ubuntu.git]
/
src
/
server
/
server.c
diff --git
a/src/server/server.c
b/src/server/server.c
index
297d083
..
5862586
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>
@@
-255,15
+257,16
@@
create_response(const char *nurl, const char *method, unsigned int *rp_code)
free(fpath);
}
free(fpath);
}
- if (resp)
{
+ if (resp)
return 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,
}
static int cbk_http_request(void *cls,
@@
-393,9
+396,9
@@
int main(int argc, char *argv[])
log_open(log_file);
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);
#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
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);
psensor_log_measures(server_data.sensors);
@@
-457,7
+467,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)