diff options
| author | Constantine A. Murenin <cnst@cvs.openbsd.org> | 2008-03-15 01:08:09 +0000 |
|---|---|---|
| committer | Constantine A. Murenin <cnst@cvs.openbsd.org> | 2008-03-15 01:08:09 +0000 |
| commit | 2a205cb661875da31bac922176a1cbc1ff2ec3f7 (patch) | |
| tree | c51f833845a847cf60f325a1a40b346e2002e5a9 | |
| parent | d649167ec3bf777cf71ab297e44201e5e31a77ed (diff) | |
explicitly report whether the lower or upper limit is exceeded; ok sthen@ ckuethe@
| -rw-r--r-- | usr.sbin/sensorsd/sensorsd.c | 31 | ||||
| -rw-r--r-- | usr.sbin/sensorsd/sensorsd.conf.5 | 6 |
2 files changed, 24 insertions, 13 deletions
diff --git a/usr.sbin/sensorsd/sensorsd.c b/usr.sbin/sensorsd/sensorsd.c index 7f43ab9f05c..2600b949906 100644 --- a/usr.sbin/sensorsd/sensorsd.c +++ b/usr.sbin/sensorsd/sensorsd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sensorsd.c,v 1.38 2008/03/14 00:06:18 ckuethe Exp $ */ +/* $OpenBSD: sensorsd.c,v 1.39 2008/03/15 01:08:08 cnst Exp $ */ /* * Copyright (c) 2003 Henning Brauer <henning@openbsd.org> @@ -41,7 +41,8 @@ enum sensorsd_s_status { SENSORSD_S_UNSPEC, /* status is unspecified */ SENSORSD_S_INVALID, /* status is invalid, per SENSOR_FINVALID */ SENSORSD_S_WITHIN, /* status is within limits */ - SENSORSD_S_OUTSIDE /* status is outside limits */ + SENSORSD_S_ABOVE, /* status is above the higher limit */ + SENSORSD_S_BELOW /* status is below the lower limit */ }; struct limits_t { @@ -288,9 +289,10 @@ check_sdlim(struct sdlim_t *sdlim) if (sensor.flags & SENSOR_FINVALID) newustatus = SENSORSD_S_INVALID; - else if (sensor.value > limit->upper || - sensor.value < limit->lower) - newustatus = SENSORSD_S_OUTSIDE; + else if (sensor.value > limit->upper) + newustatus = SENSORSD_S_ABOVE; + else if (sensor.value < limit->lower) + newustatus = SENSORSD_S_BELOW; else newustatus = SENSORSD_S_WITHIN; @@ -388,9 +390,15 @@ report_sdlim(struct sdlim_t *sdlim, time_t last_report) snprintf(us, sizeof(us), "within limits: %s", print_sensor(limit->type, limit->last_val)); break; - case SENSORSD_S_OUTSIDE: - snprintf(us, sizeof(us), "exceeds limits: %s", - print_sensor(limit->type, limit->last_val)); + case SENSORSD_S_ABOVE: + snprintf(us, sizeof(us), "exceeds limits: %s is above %s", + print_sensor(limit->type, limit->last_val), + print_sensor(limit->type, limit->upper)); + break; + case SENSORSD_S_BELOW: + snprintf(us, sizeof(us), "exceeds limits: %s is below %s", + print_sensor(limit->type, limit->last_val), + print_sensor(limit->type, limit->lower)); break; } syslog(limit->ustatus == SENSORSD_S_WITHIN ? LOG_INFO : @@ -447,8 +455,11 @@ report_sdlim(struct sdlim_t *sdlim, time_t last_report) case SENSORSD_S_WITHIN: s = "within"; break; - case SENSORSD_S_OUTSIDE: - s = "exceeds"; + case SENSORSD_S_ABOVE: + s = "above"; + break; + case SENSORSD_S_BELOW: + s = "below"; break; } r = snprintf(&buf[n], len - n, "%s", diff --git a/usr.sbin/sensorsd/sensorsd.conf.5 b/usr.sbin/sensorsd/sensorsd.conf.5 index e548e5b3007..dbd274254dc 100644 --- a/usr.sbin/sensorsd/sensorsd.conf.5 +++ b/usr.sbin/sensorsd/sensorsd.conf.5 @@ -1,4 +1,4 @@ -.\" $OpenBSD: sensorsd.conf.5,v 1.22 2008/03/14 15:23:49 jmc Exp $ +.\" $OpenBSD: sensorsd.conf.5,v 1.23 2008/03/15 01:08:08 cnst Exp $ .\" .\" Copyright (c) 2003 Henning Brauer <henning@openbsd.org> .\" Copyright (c) 2005 Matthew Gream <matthew.gream@pobox.com> @@ -16,7 +16,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: March 14 2008 $ +.Dd $Mdocdate: March 15 2008 $ .Dt SENSORSD.CONF 5 .Os .Sh NAME @@ -93,7 +93,7 @@ Tokens in the command are substituted as follows: .Bl -tag -width Ds -offset indent -compact .It %l Whether the value exceeds or is within the user specified limits. -Can be one of: "exceeds", "within", "invalid", or "uninitialised". +Can be one of: "below", "above", "within", "invalid", or "uninitialised". .It %n The sensor number. .It %s |