X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fserver%2Fserver.c;h=32b3cfd259bf7ea20bd33ec06e088e2d485e4c96;hb=40f68c37206c95bb29c310b6f4337d45b0ea8ea0;hp=a032be8496296f04e43b33eb7686997e50f8710b;hpb=2fd7bb16e4381a0c677ce21d1411680faedd3896;p=psensor.git diff --git a/src/server/server.c b/src/server/server.c index a032be8..32b3cfd 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-2012 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,10 +41,13 @@ #include "cpu.h" #endif +#include "log.h" #include "psensor_json.h" #include "url.h" #include "server.h" +static const char *DEFAULT_LOG_FILE = "/var/log/psensor-server.log"; + static const char *program_name; #define DEFAULT_PORT 3131 @@ -57,7 +60,8 @@ 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'}, {0, 0, 0, 0} }; @@ -65,8 +69,6 @@ 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() @@ -77,7 +79,7 @@ void print_version() "\n" "This is free software: you are free to change and redistribute it.\n" "There is NO WARRANTY, to the extent permitted by law.\n"), - "2010-2011"); + "2010-2012"); } void print_help() @@ -93,13 +95,16 @@ void print_help() " -v, --version display version information and exit")); puts(""); - - puts(_(" -d,--debug run in debug mode\n" - " -p,--port=PORT webserver port\n" + puts(_(" -p,--port=PORT webserver port\n" " -w,--wdir=DIR directory containing webserver pages")); puts(""); + 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(""); printf(_("Report bugs to: %s\n"), PACKAGE_BUGREPORT); puts(""); printf(_("%s home page: <%s>\n"), PACKAGE_NAME, PACKAGE_URL); @@ -168,7 +173,7 @@ create_response_api(const char *nurl, if (s) page = sensor_to_json_string(s); - } else if (debug && !strcmp(nurl, URL_API_1_0_SERVER_STOP)) { + } else if (!strcmp(nurl, URL_API_1_0_SERVER_STOP)) { server_stop_requested = 1; page = strdup(_("

" @@ -285,8 +290,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,6 +312,7 @@ int main(int argc, char *argv[]) int port = DEFAULT_PORT; int optc; int cmdok = 1; + char *log_file; program_name = argv[0]; @@ -320,9 +325,10 @@ int main(int argc, char *argv[]) server_data.www_dir = NULL; server_data.psysinfo.interfaces = NULL; + log_file = NULL; while ((optc = getopt_long(argc, argv, - "vhp:w:d", long_options, NULL)) != -1) { + "vhp:w:d:", long_options, NULL)) != -1) { switch (optc) { case 'w': if (optarg) @@ -339,7 +345,14 @@ int main(int argc, char *argv[]) print_version(); exit(EXIT_SUCCESS); case 'd': - debug = 1; + log_level = atoi(optarg); + log_printf(LOG_INFO, + _("Enables debug mode: %d"), + log_level); + break; + case 'l': + if (optarg) + log_file = strdup(optarg); break; default: cmdok = 0; @@ -347,7 +360,11 @@ int main(int argc, char *argv[]) } } - server_data.www_dir = strdup(DEFAULT_WWW_DIR); + 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"), @@ -355,9 +372,11 @@ int main(int argc, char *argv[]) exit(EXIT_FAILURE); } + 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); @@ -388,6 +407,8 @@ int main(int argc, char *argv[]) #endif psensor_list_update_measures(server_data.sensors); + psensor_log_measures(server_data.sensors); + pthread_mutex_unlock(&mutex); sleep(5); } @@ -407,5 +428,8 @@ int main(int argc, char *argv[]) cpu_cleanup(); #endif + if (log_file != DEFAULT_LOG_FILE) + free(log_file); + return EXIT_SUCCESS; }