Skip to content

Commit

Permalink
Merge pull request networkupstools#2462 from avg-I/issue-2454
Browse files Browse the repository at this point in the history
clients/upsmon: restore handling of comm failure while on battery
  • Loading branch information
jimklimov authored Jun 10, 2024
2 parents 2ebc284 + 16ff315 commit ad19e07
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 8 deletions.
4 changes: 4 additions & 0 deletions NEWS.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,10 @@ https://github.com/networkupstools/nut/milestone/11
* Addition of "NUT Simulated devices" support to `nut-scanner` in v2.8.2
broke detection of (in-)ability to find and query "Old NUT" servers via
`libupsclient.so` (internal flag got always enabled). [#2246]
* A fix for `upsmon` v2.8.1 setting of `OFFDURATION` [PR #2108, issue #2104,
revisiting PR #2055, issue #2044] was overly zealous and impacted also
the `OB` state in cases where communications to the data server were
severed and `DEADTIME` setting was not honored. [PR #2462, issue #2454]
- drivers, `upsd`, `upsmon`: reduce "scary noise" about failure to `fopen()`
the PID file (which most of the time means that no previous instance of
Expand Down
8 changes: 0 additions & 8 deletions clients/upsmon.c
Original file line number Diff line number Diff line change
Expand Up @@ -1111,14 +1111,6 @@ static int is_ups_critical(utype_t *ups)
ups->sys);
return 1;
}

if (ups->linestate == 0) {
upslogx(LOG_WARNING,
"UPS [%s] was last known to be not fully online "
"and currently is not communicating, assuming dead",
ups->sys);
return 1;
}
}

/* administratively OFF (long enough, see OFFDURATION) */
Expand Down

0 comments on commit ad19e07

Please sign in to comment.