X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fserver%2Fserver.c;h=5c1a95ca7ac3c9cb62949e487be7e7335f36884b;hb=8db1051ea438d0e346a509210299a2a03e8c127d;hp=a10a24409242dad5eb3401738f04556c07412698;hpb=ba5cbaaab22c0c4c92e4ed9f4102032e74ea44d0;p=psensor.git diff --git a/src/server/server.c b/src/server/server.c index a10a244..5c1a95c 100644 --- a/src/server/server.c +++ b/src/server/server.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2012 jeanfi@gmail.com + * Copyright (C) 2010-2014 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 @@ -16,12 +16,13 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA * 02110-1301 USA */ +#define _LARGEFILE_SOURCE 1 +#include "config.h" + #include #include #define _(str) gettext(str) -#include "config.h" - #include #include #include @@ -38,11 +39,13 @@ #ifdef HAVE_GTOP #include "sysinfo.h" -#include "cpu.h" +#include #endif -#include "log.h" +#include +#include #include "psensor_json.h" +#include #include "url.h" #include "server.h" #include "slog.h" @@ -67,16 +70,17 @@ 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} }; static struct server_data server_data; -static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; +static pthread_mutex_t mutex; static int server_stop_requested; -void print_version() +static void print_version() { printf("psensor-server %s\n", VERSION); printf(_("Copyright (C) %s jeanfi@gmail.com\n" @@ -87,7 +91,7 @@ void print_version() "2010-2012"); } -void print_help() +static void print_help() { printf(_("Usage: %s [OPTION]...\n"), program_name); @@ -107,7 +111,9 @@ void print_help() puts(_(" -d, --debug=LEVEL " "set the debug level, integer between 0 and 3")); puts(_(" -l, --log-file=PATH set the log file to PATH")); - puts(_(" -s, --sensor-log-file=PATH set the sensor 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); @@ -116,9 +122,9 @@ void print_help() } /* - Returns the file path corresponding to a given URL -*/ -char *get_path(const char *url, const char *www_dir) + * Returns the file path corresponding to a given URL + */ +static char *get_path(const char *url, const char *www_dir) { const char *p; char *res; @@ -146,39 +152,37 @@ file_reader(void *cls, uint64_t pos, char *buf, int max) { FILE *file = cls; - fseek(file, pos, SEEK_SET); + fseeko(file, pos, SEEK_SET); return fread(buf, 1, max, file); } -struct MHD_Response * -create_response_api(const char *nurl, - const char *method, - unsigned int *rp_code) +static struct MHD_Response * +create_response_api(const char *nurl, const char *method, unsigned int *rp_code) { struct MHD_Response *resp; 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); @@ -199,11 +203,10 @@ create_response_api(const char *nurl, return NULL; } -struct MHD_Response * -create_response_file(const char *nurl, - const char *method, - unsigned int *rp_code, - const char *fpath) +static struct MHD_Response *create_response_file(const char *nurl, + const char *method, + unsigned int *rp_code, + const char *fpath) { struct stat st; int ret; @@ -238,12 +241,12 @@ create_response_file(const char *nurl, return NULL; } -struct MHD_Response * +static struct MHD_Response * 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); @@ -253,25 +256,25 @@ create_response(const char *nurl, const char *method, unsigned int *rp_code) 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, - struct MHD_Connection *connection, - const char *url, - const char *method, - const char *version, - const char *upload_data, - size_t *upload_data_size, void **ptr) +static int cbk_http_request(void *cls, + struct MHD_Connection *connection, + const char *url, + const char *method, + const char *version, + const char *upload_data, + size_t *upload_data_size, void **ptr) { static int dummy; struct MHD_Response *response; @@ -298,9 +301,9 @@ cbk_http_request(void *cls, nurl = url_normalize(url); - pthread_mutex_lock(&mutex); + pmutex_lock(&mutex); response = create_response(nurl, method, &resp_code); - pthread_mutex_unlock(&mutex); + pmutex_unlock(&mutex); ret = MHD_queue_response(connection, resp_code, response); MHD_destroy_response(response); @@ -313,7 +316,7 @@ cbk_http_request(void *cls, int main(int argc, char *argv[]) { struct MHD_Daemon *d; - int port, opti, optc, cmdok; + int port, opti, optc, cmdok, ret, slog_interval; char *log_file, *slog_file; program_name = argv[0]; @@ -326,9 +329,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; @@ -363,6 +369,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; @@ -382,11 +391,14 @@ int main(int argc, char *argv[]) if (!log_file) log_file = strdup(DEFAULT_LOG_FILE); + pmutex_init(&mutex); + log_open(log_file); psensor_init(); 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); @@ -408,11 +420,19 @@ int main(int argc, char *argv[]) log_info(_("WWW directory: %s"), server_data.www_dir); log_info(_("URL: http://localhost:%d"), port); - if (slog_file) - slog_init(slog_file, server_data.sensors); + if (slog_file) { + 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.")); + } while (!server_stop_requested) { - pthread_mutex_lock(&mutex); + pmutex_lock(&mutex); #ifdef HAVE_GTOP sysinfo_update(&server_data.psysinfo); @@ -420,11 +440,11 @@ int main(int argc, char *argv[]) #endif psensor_list_update_measures(server_data.sensors); - psensor_log_measures(server_data.sensors); + lmsensor_psensor_list_update(server_data.sensors); - slog_write_sensors(server_data.sensors); + psensor_log_measures(server_data.sensors); - pthread_mutex_unlock(&mutex); + pmutex_unlock(&mutex); sleep(5); } @@ -442,7 +462,6 @@ int main(int argc, char *argv[]) #ifdef HAVE_GTOP sysinfo_cleanup(); - cpu_cleanup(); #endif if (log_file != DEFAULT_LOG_FILE)