/*
- * Copyright (C) 2010-2012 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
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301 USA
*/
+#define _LARGEFILE_SOURCE 1
+#include "config.h"
+
#include <locale.h>
#include <libintl.h>
#define _(str) gettext(str)
-#include "config.h"
-
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#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 \
+(_("<html><body><p>Server stop requested</p></body></html>"))
static const char *program_name;
-#define DEFAULT_PORT 3131
+static const int DEFAULT_PORT = 3131;
#define PAGE_NOT_FOUND (_("<html><body><p>"\
"Page not found - Go to <a href='/'>Main page</a></p></body>"))
{"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}
};
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"
"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:");
" -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(_(" --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);
puts("");
printf(_("%s home page: <%s>\n"), PACKAGE_NAME, PACKAGE_URL);
}
/*
- 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;
{
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 (debug && !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><body><p>"
- "Server stop requested</p></body></html>"));
+ page = strdup(HTML_STOP_REQUESTED);
}
if (page) {
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;
(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);
}
}
-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;
*ptr = NULL; /* clear context pointer */
- if (debug)
- printf(_("HTTP Request: %s\n"), url);
+ log_debug(_("HTTP Request: %s"), url);
nurl = url_normalize(url);
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];
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)
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;
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);
#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 */
cpu_cleanup();
#endif
+ if (log_file != DEFAULT_LOG_FILE)
+ free(log_file);
+
return EXIT_SUCCESS;
}
projects / psensor-pkg-debian.git / blobdiff