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
")) @@ -62,6 +66,8 @@ static struct option long_options[] = { {"wdir", required_argument, 0, 'w'}, {"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} }; @@ -71,7 +77,7 @@ static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; 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" @@ -82,12 +88,12 @@ void print_version() "2010-2012"); } -void print_help() +static void print_help() { printf(_("Usage: %s [OPTION]...\n"), program_name); - puts(_("psensor-server is an HTTP server " - "for monitoring hardware sensors remotely.")); + puts(_("psensor-server is an HTTP server for monitoring hardware " + "sensors remotely.")); puts(""); puts("Options:"); @@ -99,10 +105,12 @@ void print_help() " -w,--wdir=DIR directory containing webserver pages")); puts(""); - puts(_(" -d, --debug=LEVEL " + 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(_(" -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); @@ -111,9 +119,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; @@ -141,43 +149,40 @@ 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(_("" - "Server stop requested
")); + page = strdup(HTML_STOP_REQUESTED); } if (page) { @@ -195,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; @@ -234,12 +238,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); @@ -260,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; @@ -309,10 +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; - char *log_file; + int port, opti, optc, cmdok, ret, slog_interval; + char *log_file, *slog_file; program_name = argv[0]; @@ -324,11 +325,20 @@ int main(int argc, char *argv[]) #endif server_data.www_dir = NULL; +#ifdef HAVE_GTOP server_data.psysinfo.interfaces = NULL; +#endif log_file = NULL; - - while ((optc = getopt_long(argc, argv, - "vhp:w:d:", long_options, NULL)) != -1) { + 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) @@ -346,32 +356,37 @@ int main(int argc, char *argv[]) exit(EXIT_SUCCESS); case 'd': log_level = atoi(optarg); - log_printf(LOG_INFO, - _("Enables debug mode: %d"), - log_level); + 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; break; } } - if (!server_data.www_dir) - server_data.www_dir = strdup(DEFAULT_WWW_DIR); - - if (!log_file) - log_file = strdup(DEFAULT_LOG_FILE); - if (!cmdok || optind != argc) { fprintf(stderr, _("Try `%s --help' for more information.\n"), program_name); 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(); @@ -394,9 +409,20 @@ int main(int argc, char *argv[]) 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); @@ -413,6 +439,8 @@ int main(int argc, char *argv[]) sleep(5); } + slog_close(); + MHD_stop_daemon(d); /* sanity cleanup for valgrind */