X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fserver%2Fserver.c;h=a42f931e2a521c3e8d6f81b2554df5b53b9c707b;hb=8193f2f858ce0dc30f1d5607b9e5a21761522633;hp=d55ecf29149201abebabf972b743de0a814467ca;hpb=22028eb2107acc13c8da4a9203d3c8c83f5c53f9;p=psensor.git diff --git a/src/server/server.c b/src/server/server.c index d55ecf2..a42f931 100644 --- a/src/server/server.c +++ b/src/server/server.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2011 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 @@ -41,14 +41,20 @@ #include "cpu.h" #endif +#include "log.h" #include "psensor_json.h" #include "url.h" -#include "p_io.h" #include "server.h" +#include "slog.h" + +static const char *DEFAULT_LOG_FILE = "/var/log/psensor-server.log"; + +#define HTML_STOP_REQUESTED \ +(_("
Server stop requested
")) static const char *program_name; -#define DEFAULT_PORT 3131 +static const int DEFAULT_PORT = 3131; #define PAGE_NOT_FOUND (_(""\ "Page not found - Go to Main page
")) @@ -58,7 +64,10 @@ static struct option long_options[] = { {"help", no_argument, 0, 'h'}, {"port", required_argument, 0, 'p'}, {"wdir", required_argument, 0, 'w'}, - {"debug", no_argument, 0, 'd'}, + {"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} }; @@ -66,11 +75,9 @@ static struct server_data server_data; static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; -static int debug; - 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" @@ -78,15 +85,15 @@ void print_version() "" - "Server stop requested
")); + page = strdup(HTML_STOP_REQUESTED); } if (page) { @@ -193,11 +200,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; @@ -225,19 +231,19 @@ create_response_file(const char *nurl, (MHD_ContentReaderFreeCallback)&fclose); } else { - log_printf(LOG_ERR, "Failed to open: %s\n", fpath); + log_err("Failed to open: %s.", fpath); } } 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); @@ -258,14 +264,13 @@ create_response(const char *nurl, const char *method, unsigned int *rp_code) } } -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; @@ -288,8 +293,7 @@ cbk_http_request(void *cls, *ptr = NULL; /* clear context pointer */ - if (debug) - printf(_("HTTP Request: %s\n"), url); + log_debug(_("HTTP Request: %s"), url); nurl = url_normalize(url); @@ -308,9 +312,8 @@ cbk_http_request(void *cls, int main(int argc, char *argv[]) { struct MHD_Daemon *d; - int port = DEFAULT_PORT; - int optc; - int cmdok = 1; + int port, opti, optc, cmdok, ret, slog_interval; + char *log_file, *slog_file; program_name = argv[0]; @@ -321,11 +324,21 @@ int main(int argc, char *argv[]) textdomain(PACKAGE); #endif - server_data.www_dir = DEFAULT_WWW_DIR; + server_data.www_dir = NULL; +#ifdef HAVE_GTOP server_data.psysinfo.interfaces = NULL; - - while ((optc = getopt_long(argc, argv, - "vhp:w:d", long_options, NULL)) != -1) { +#endif + log_file = NULL; + slog_file = NULL; + slog_interval = 300; + port = DEFAULT_PORT; + cmdok = 1; + + while ((optc = getopt_long(argc, + argv, + "vhp:w:d:l:", + long_options, + &opti)) != -1) { switch (optc) { case 'w': if (optarg) @@ -342,7 +355,19 @@ int main(int argc, char *argv[]) print_version(); exit(EXIT_SUCCESS); case 'd': - debug = 1; + log_level = atoi(optarg); + log_info(_("Enables debug mode: %d"), log_level); + break; + case 'l': + if (optarg) + log_file = strdup(optarg); + break; + 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; @@ -356,45 +381,66 @@ int main(int argc, char *argv[]) exit(EXIT_FAILURE); } + if (!server_data.www_dir) + server_data.www_dir = strdup(DEFAULT_WWW_DIR); + + if (!log_file) + log_file = strdup(DEFAULT_LOG_FILE); + + log_open(log_file); + psensor_init(); - server_data.sensors = get_all_sensors(600); + server_data.sensors = get_all_sensors(0, 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")); + log_err(_("No sensors detected.")); d = MHD_start_daemon(MHD_USE_THREAD_PER_CONNECTION, port, NULL, NULL, &cbk_http_request, server_data.sensors, MHD_OPTION_END); if (!d) { - fprintf(stderr, _("ERROR: Fail to create web server\n")); + log_err(_("Failed to create Web server.")); exit(EXIT_FAILURE); } - 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); + log_info(_("Web server started on port: %d"), port); + log_info(_("WWW directory: %s"), server_data.www_dir); + log_info(_("URL: http://localhost:%d"), port); + + 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); #ifdef HAVE_GTOP -#ifdef HAVE_SYSINFO_FCT sysinfo_update(&server_data.psysinfo); -#endif cpu_usage_sensor_update(server_data.cpu_usage); #endif psensor_list_update_measures(server_data.sensors); + psensor_log_measures(server_data.sensors); + pthread_mutex_unlock(&mutex); sleep(5); } + slog_close(); + MHD_stop_daemon(d); /* sanity cleanup for valgrind */ @@ -406,11 +452,12 @@ int main(int argc, char *argv[]) sensors_cleanup(); #ifdef HAVE_GTOP -#ifdef HAVE_SYSINFO_FCT sysinfo_cleanup(); -#endif cpu_cleanup(); #endif + if (log_file != DEFAULT_LOG_FILE) + free(log_file); + return EXIT_SUCCESS; }