{
printf(_("Usage: %s [OPTION]...\n"), program_name);
- puts(_("psensor is a GTK application for monitoring hardware sensors, "
+ puts(_("Psensor is a GTK+ application for monitoring hardware sensors, "
"including temperatures and fan speeds."));
puts("");
puts(_(" --use-libatasmart "
"use atasmart library for disk monitoring "
"instead of hddtemp daemon"));
+ puts(_(" -n, --new-instance "
+ "force the creation of a new Psensor application"));
puts("");
puts(_(" -d, --debug=LEVEL "
static void cb_alarm_raised(struct psensor *sensor, void *data)
{
#ifdef HAVE_LIBNOTIFY
- if (sensor->enabled)
+ if (sensor->alarm_enabled)
ui_notify(sensor, (struct ui_psensor *)data);
#endif
}
s->cb_alarm_raised = cb_alarm_raised;
s->cb_alarm_raised_data = ui;
- if (is_temp_type(s->type)) {
- s->alarm_limit
- = config_get_sensor_alarm_limit(s->id, 60);
+ s->alarm_high_threshold
+ = config_get_sensor_alarm_high_threshold(s->id);
+ s->alarm_low_threshold
+ = config_get_sensor_alarm_low_threshold(s->id);
+
+ if (is_temp_type(s->type) || is_fan_type(s->type)) {
s->alarm_enabled
= config_get_sensor_alarm_enabled(s->id);
} else {
- s->alarm_limit = 0;
+ s->alarm_high_threshold = 0;
s->alarm_enabled = 0;
}
config_cleanup();
log_debug("Cleanup done, closing log");
-
- log_close();
}
/*
rsensor_init();
sensors = get_remote_sensors(url, 600);
#else
- fprintf(stderr,
- _("ERROR: Not compiled with remote sensor support.\n"));
+ log_err(_("Psensor has not been compiled"
+ " with remote sensor support."));
exit(EXIT_FAILURE);
#endif
} else {
if (!new_instance && g_application_get_is_remote(app)) {
g_application_activate(app);
- log_warn(_("Psensor instance already exists"));
+ log_warn(_("A Psensor instance already exists."));
exit(EXIT_SUCCESS);
}
g_object_ref(app);
cleanup(&ui);
+
log_debug("Quitting...");
+ log_close();
return 0;
}