improve clearing alarms on client startup

This commit is contained in:
Richard Frith-Macdonald 2019-02-15 08:25:45 +00:00
parent e3bee4fc64
commit e5963632fd
2 changed files with 5 additions and 3 deletions

View file

@ -3,6 +3,8 @@
* EcControl.m: If we get an alarm clear before we have reported the * EcControl.m: If we get an alarm clear before we have reported the
original alarm, we should report the alarm before reporting the original alarm, we should report the alarm before reporting the
clear. clear.
* EcCommand.m: Be slower to clear alarms on client startup; in case
it's just going to crash fairly immediately.
2019-02-11 Richard Frith-Macdonald <rfm@gnu.org> 2019-02-11 Richard Frith-Macdonald <rfm@gnu.org>

View file

@ -729,16 +729,16 @@ static NSString* cmdWord(NSArray* a, unsigned int pos)
/* See if we have a fitting client - and update records. /* See if we have a fitting client - and update records.
*/ */
r = [self findIn: clients byObject: (id)from]; r = [self findIn: clients byObject: (id)from];
if (r != nil) [r gnip: num];
if (r != nil && num > 2)
{ {
NSString *managedObject; NSString *managedObject;
NSString *n; NSString *n;
EcAlarm *a; EcAlarm *a;
[r gnip: num];
n = [r name]; n = [r name];
/* After the first ping response from a client we assume /* After the first few ping responses from a client we assume
* that client has completed startup and is running OK. * that client has completed startup and is running OK.
* We can therefore clear any loss of client alarm, any * We can therefore clear any loss of client alarm, any
* alarm for being unable to register, and launch failure * alarm for being unable to register, and launch failure