moved url.c to lib

[psensor.git] / src / server / server.c

diff --git a/src/server/server.c b/src/server/server.c
index a40ff0a..e0757cf 100644 (file)
--- a/src/server/server.c
+++ b/src/server/server.c
@@ -38,10 +38,11 @@
 
 #ifdef HAVE_GTOP
 #include "sysinfo.h"
+#include "cpu.h"
 #endif
 
 #include "psensor_json.h"
-#include "plib/url.h"
+#include "url.h"
 #include "plib/plib_io.h"
 #include "server.h"
 
@@ -129,8 +130,13 @@ char *get_path(const char *url, const char *www_dir)
        return res;
 }
 
+#if MHD_VERSION >= 0x00090200
+static int
+file_reader(void *cls, uint64_t pos, char *buf, size_t max)
+#else
 static int
 file_reader(void *cls, uint64_t pos, char *buf, int max)
+#endif
 {
        FILE *file = cls;
 
@@ -155,6 +161,8 @@ create_response_api(const char *nurl,
        } else if (!strcmp(nurl, URL_API_1_0_SYSINFO)) {
 
                page = sysinfo_to_json_string(&server_data.psysinfo);
+       } else if (!strcmp(nurl, URL_API_1_0_CPU_USAGE)) {
+               page = sensor_to_json_string(server_data.cpu_usage);
 #endif
        } else if (!strncmp(nurl, URL_BASE_API_1_0_SENSORS,
                            strlen(URL_BASE_API_1_0_SENSORS))
@@ -263,7 +271,6 @@ cbk_http_request(void *cls,
        int ret;
        char *nurl;
        unsigned int resp_code;
-       char *page = NULL;
 
        if (strcmp(method, "GET"))
                return MHD_NO;
@@ -348,12 +355,13 @@ int main(int argc, char *argv[])
                exit(EXIT_FAILURE);
        }
 
-       if (!lmsensor_init()) {
-               fprintf(stderr, _("ERROR: failed to init lm-sensors\n"));
-               exit(EXIT_FAILURE);
-       }
+       psensor_init();
 
-       server_data.sensors = get_all_sensors(1);
+       server_data.sensors = get_all_sensors(600);
+
+#ifdef HAVE_GTOP
+       server_data.cpu_usage = create_cpu_usage_sensor(600);
+#endif
 
        if (!*server_data.sensors)
                fprintf(stderr, _("ERROR: no sensors detected\n"));
@@ -367,15 +375,16 @@ int main(int argc, char *argv[])
                exit(EXIT_FAILURE);
        }
 
-       printf(_("Web server started on port: %d\n"), port);
-       printf(_("WWW directory: %s\n"), server_data.www_dir);
-       printf(_("URL: http://localhost:%d\n"), port);
+       log_printf(LOG_INFO, _("Web server started on port: %d"), port);
+       log_printf(LOG_INFO, _("WWW directory: %s"), server_data.www_dir);
+       log_printf(LOG_INFO, _("URL: http://localhost:%d"), port);
 
        while (!server_stop_requested) {
                pthread_mutex_lock(&mutex);
 
 #ifdef HAVE_GTOP
                sysinfo_update(&server_data.psysinfo);
+               cpu_usage_sensor_update(server_data.cpu_usage);
 #endif
                psensor_list_update_measures(server_data.sensors);
 
@@ -387,11 +396,15 @@ int main(int argc, char *argv[])
 
        /* sanity cleanup for valgrind */
        psensor_list_free(server_data.sensors);
+#ifdef HAVE_GTOP
+       psensor_free(server_data.cpu_usage);
+#endif
        free(server_data.www_dir);
        sensors_cleanup();
 
 #ifdef HAVE_GTOP
        sysinfo_cleanup();
+       cpu_cleanup();
 #endif
 
        return EXIT_SUCCESS;