added log level to -d option.
added --log-file option.
logged measures when log level is 3.
** psensor: fixed wrong background color, get the background color of
the window and not the canvas widget. (Closes LP: #973122)
** psensor: used the foreground color defined by the theme for the
** psensor: fixed wrong background color, get the background color of
the window and not the canvas widget. (Closes LP: #973122)
** psensor: used the foreground color defined by the theme for the
+ font of the graph legend.
** psensor: used tab layout for psensor preferences .
** psensor: temperature unit choice (celcius/fahrenheit).
** psensor: used tab layout for psensor preferences .
** psensor: temperature unit choice (celcius/fahrenheit).
+** psensor-server: fixed --wdir option.
+** psensor-server: added log level to -d option.
+** psensor-server: added --log-file option.
+** psensor-server: logged measures when log level is 3.
exec_prefix = ${prefix}
datarootdir = ${prefix}/share
datadir = ${datarootdir}
exec_prefix = ${prefix}
datarootdir = ${prefix}/share
datadir = ${datarootdir}
+void psensor_log_measures(struct psensor **sensors)
+{
+ if (log_level == LOG_DEBUG)
+ while (*sensors) {
+ log_debug("Measure: %s %.2f",
+ (*sensors)->name,
+ psensor_get_current_value(*sensors));
+
+ sensors++;
+ }
+}
+
void psensor_init()
{
lmsensor_init();
void psensor_init()
{
lmsensor_init();
double celcius_to_fahrenheit(double c);
double celcius_to_fahrenheit(double c);
+void psensor_log_measures(struct psensor **sensors);
+
-static void log_measures(struct psensor **sensors)
-{
- if (log_level == LOG_DEBUG)
- while (*sensors) {
- log_debug("Measure: %s %.2f",
- (*sensors)->name,
- psensor_get_current_value(*sensors));
-
- sensors++;
- }
-}
-
void update_psensor_measures(struct ui_psensor *ui)
{
struct psensor **sensors = ui->sensors;
void update_psensor_measures(struct ui_psensor *ui)
{
struct psensor **sensors = ui->sensors;
amd_psensor_list_update(sensors);
#endif
amd_psensor_list_update(sensors);
#endif
+ psensor_log_measures(sensors);
g_mutex_unlock(ui->sensors_mutex);
g_mutex_unlock(ui->sensors_mutex);
The URL http://hostname:3131/api/1.0/sensors returns a JSON array
containing all JSON objects of type 'sensor'.
The URL http://hostname:3131/api/1.0/sensors returns a JSON array
containing all JSON objects of type 'sensor'.
-If run in debug mode, psensor\-server can be stopped by sending an HTTP
+psensor\-server can be stopped by sending an HTTP
request with the URL 'http://hostname:port/api/1.0/server/stop'.
[WARNING]
request with the URL 'http://hostname:port/api/1.0/server/stop'.
[WARNING]
#include "psensor_json.h"
#include "url.h"
#include "server.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
static const char *program_name;
#define DEFAULT_PORT 3131
{"help", no_argument, 0, 'h'},
{"port", required_argument, 0, 'p'},
{"wdir", required_argument, 0, 'w'},
{"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'},
static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
static int server_stop_requested;
void print_version()
static int server_stop_requested;
void print_version()
" -v, --version display version information and exit"));
puts("");
" -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("");
" -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"));
printf(_("Report bugs to: %s\n"), PACKAGE_BUGREPORT);
puts("");
printf(_("%s home page: <%s>\n"), PACKAGE_NAME, PACKAGE_URL);
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);
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>"
server_stop_requested = 1;
page = strdup(_("<html><body><p>"
*ptr = NULL; /* clear context pointer */
*ptr = NULL; /* clear context pointer */
- if (debug)
- printf(_("HTTP Request: %s\n"), url);
+ log_debug(_("HTTP Request: %s"), url);
nurl = url_normalize(url);
nurl = url_normalize(url);
int port = DEFAULT_PORT;
int optc;
int cmdok = 1;
int port = DEFAULT_PORT;
int optc;
int cmdok = 1;
server_data.www_dir = NULL;
server_data.psysinfo.interfaces = NULL;
server_data.www_dir = NULL;
server_data.psysinfo.interfaces = NULL;
while ((optc = getopt_long(argc, argv,
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)
switch (optc) {
case 'w':
if (optarg)
print_version();
exit(EXIT_SUCCESS);
case 'd':
print_version();
exit(EXIT_SUCCESS);
case 'd':
+ 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;
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"),
if (!cmdok || optind != argc) {
fprintf(stderr, _("Try `%s --help' for more information.\n"),
psensor_init();
server_data.sensors = get_all_sensors(0, 600);
psensor_init();
server_data.sensors = get_all_sensors(0, 600);
#endif
psensor_list_update_measures(server_data.sensors);
#endif
psensor_list_update_measures(server_data.sensors);
+ psensor_log_measures(server_data.sensors);
+
pthread_mutex_unlock(&mutex);
sleep(5);
}
pthread_mutex_unlock(&mutex);
sleep(5);
}
+ if (log_file != DEFAULT_LOG_FILE)
+ free(log_file);
+