Prevent overlapping reboot warning messages
It's hard to say if this is the cause, but it won't hurt to clear existing intervals just in case.
This commit is contained in:
@@ -282,6 +282,9 @@ public abstract class RebootManager
|
|||||||
// schedule the next warning
|
// schedule the next warning
|
||||||
final int nextLevel = level + 1;
|
final int nextLevel = level + 1;
|
||||||
final int nextMinutes = (nextLevel == warnings.length) ? 0 : warnings[nextLevel];
|
final int nextMinutes = (nextLevel == warnings.length) ? 0 : warnings[nextLevel];
|
||||||
|
if (_interval != null) {
|
||||||
|
_interval.cancel();
|
||||||
|
}
|
||||||
_interval = _omgr.newInterval(new Runnable() {
|
_interval = _omgr.newInterval(new Runnable() {
|
||||||
public void run () {
|
public void run () {
|
||||||
doWarning(nextLevel, nextMinutes);
|
doWarning(nextLevel, nextMinutes);
|
||||||
@@ -303,6 +306,9 @@ public abstract class RebootManager
|
|||||||
|
|
||||||
log.info("Reboot delayed due to outstanding locks", "locks", _rebootLocks.elements());
|
log.info("Reboot delayed due to outstanding locks", "locks", _rebootLocks.elements());
|
||||||
broadcast("m.reboot_delayed");
|
broadcast("m.reboot_delayed");
|
||||||
|
if (_interval != null) {
|
||||||
|
_interval.cancel();
|
||||||
|
}
|
||||||
(_interval = _omgr.newInterval(new Runnable() {
|
(_interval = _omgr.newInterval(new Runnable() {
|
||||||
public void run () {
|
public void run () {
|
||||||
doWarning(getWarnings().length, 0);
|
doWarning(getWarnings().length, 0);
|
||||||
|
|||||||
Reference in New Issue
Block a user