Fixed compilation without gtop2 lib.

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

diff --git a/src/server/server.c b/src/server/server.c
index 8ed87e8..5431725 100644 (file)
--- a/src/server/server.c
+++ b/src/server/server.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2012 jeanfi@gmail.com
+ * Copyright (C) 2010-2013 jeanfi@gmail.com
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -67,6 +67,7 @@ static struct option long_options[] = {
        {"debug", required_argument, 0, 'd'},
        {"log-file", required_argument, 0, 'l'},
        {"sensor-log-file", required_argument, 0, 0},
+       {"sensor-log-interval", required_argument, 0, 0},
        {0, 0, 0, 0}
 };
 
@@ -108,6 +109,8 @@ static void print_help()
               "set the debug level, integer between 0 and 3"));
        puts(_("  -l, --log-file=PATH   set the log file to PATH"));
        puts(_("  --sensor-log-file=PATH set the sensor log file to PATH"));
+       puts(_("  --sensor-log-interval=S "
+              "set the sensor log interval to S (seconds)"));
 
        puts("");
        printf(_("Report bugs to: %s\n"), PACKAGE_BUGREPORT);
@@ -157,26 +160,26 @@ create_response_api(const char *nurl, const char *method, unsigned int *rp_code)
        struct psensor *s;
        char *page = NULL;
 
-       if (!strcmp(nurl, URL_BASE_API_1_0_SENSORS))  {
+       if (!strcmp(nurl, URL_BASE_API_1_1_SENSORS))  {
                page = sensors_to_json_string(server_data.sensors);
 #ifdef HAVE_GTOP
-       } else if (!strcmp(nurl, URL_API_1_0_SYSINFO)) {
+       } else if (!strcmp(nurl, URL_API_1_1_SYSINFO)) {
                page = sysinfo_to_json_string(&server_data.psysinfo);
-       } else if (!strcmp(nurl, URL_API_1_0_CPU_USAGE)) {
+       } else if (!strcmp(nurl, URL_API_1_1_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))
-                  && nurl[strlen(URL_BASE_API_1_0_SENSORS)] == '/') {
+       } else if (!strncmp(nurl, URL_BASE_API_1_1_SENSORS,
+                           strlen(URL_BASE_API_1_1_SENSORS))
+                  && nurl[strlen(URL_BASE_API_1_1_SENSORS)] == '/') {
 
-               const char *sid = nurl + strlen(URL_BASE_API_1_0_SENSORS) + 1;
+               const char *sid = nurl + strlen(URL_BASE_API_1_1_SENSORS) + 1;
 
                s = psensor_list_get_by_id(server_data.sensors, sid);
 
                if (s)
                        page = sensor_to_json_string(s);
 
-       } else if (!strcmp(nurl, URL_API_1_0_SERVER_STOP)) {
+       } else if (!strcmp(nurl, URL_API_1_1_SERVER_STOP)) {
 
                server_stop_requested = 1;
                page = strdup(HTML_STOP_REQUESTED);
@@ -240,7 +243,7 @@ create_response(const char *nurl, const char *method, unsigned int *rp_code)
 {
        struct MHD_Response *resp = NULL;
 
-       if (!strncmp(nurl, URL_BASE_API_1_0, strlen(URL_BASE_API_1_0))) {
+       if (!strncmp(nurl, URL_BASE_API_1_1, strlen(URL_BASE_API_1_1))) {
                resp = create_response_api(nurl, method, rp_code);
        } else {
                char *fpath = get_path(nurl, server_data.www_dir);
@@ -309,7 +312,7 @@ static int cbk_http_request(void *cls,
 int main(int argc, char *argv[])
 {
        struct MHD_Daemon *d;
-       int port, opti, optc, cmdok, ret;
+       int port, opti, optc, cmdok, ret, slog_interval;
        char *log_file, *slog_file;
 
        program_name = argv[0];
@@ -322,9 +325,12 @@ int main(int argc, char *argv[])
 #endif
 
        server_data.www_dir = NULL;
+#ifdef HAVE_GTOP
        server_data.psysinfo.interfaces = NULL;
+#endif
        log_file = NULL;
        slog_file = NULL;
+       slog_interval = 300;
        port = DEFAULT_PORT;
        cmdok = 1;
 
@@ -359,6 +365,9 @@ int main(int argc, char *argv[])
                case 0:
                        if (!strcmp(long_options[opti].name, "sensor-log-file"))
                                slog_file = strdup(optarg);
+                       else if (!strcmp(long_options[opti].name,
+                                        "sensor-log-interval"))
+                               slog_interval = atoi(optarg);
                        break;
                default:
                        cmdok = 0;
@@ -405,7 +414,12 @@ int main(int argc, char *argv[])
        log_info(_("URL: http://localhost:%d"), port);
 
        if (slog_file) {
-               ret = slog_activate(slog_file, server_data.sensors, &mutex, 5);
+               if (slog_interval <= 0)
+                       slog_interval = 300;
+               ret = slog_activate(slog_file,
+                                   server_data.sensors,
+                                   &mutex,
+                                   slog_interval);
                if (!ret)
                        log_err(_("Failed to activate logging of sensors."));
        }