#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
{"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}
};
static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
-static int debug;
-
static int server_stop_requested;
void print_version()
" -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);
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(_("<html><body><p>"
*ptr = NULL; /* clear context pointer */
- if (debug)
- printf(_("HTTP Request: %s\n"), url);
+ log_debug(_("HTTP Request: %s"), url);
nurl = url_normalize(url);
int port = DEFAULT_PORT;
int optc;
int cmdok = 1;
+ char *log_file;
program_name = argv[0];
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)
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;
}
}
- 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"),
exit(EXIT_FAILURE);
}
+ log_open(log_file);
+
psensor_init();
server_data.sensors = get_all_sensors(0, 600);
#endif
psensor_list_update_measures(server_data.sensors);
+ psensor_log_measures(server_data.sensors);
+
pthread_mutex_unlock(&mutex);
sleep(5);
}
cpu_cleanup();
#endif
+ if (log_file != DEFAULT_LOG_FILE)
+ free(log_file);
+
return EXIT_SUCCESS;
}