gnustep/libs-ec
0
0
Fork 0
mirror of https://github.com/gnustep/libs-ec.git synced 2025-05-31 09:21:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Alterations to raise an alert if we launch a process and it then fails to

Browse source 
connect to us. 



git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/devmodules/dev-libs/ec@34906 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2012-03-08 12:21:42 +00:00
parent 0253de4253
commit 13323e063a
1 changed files with 53 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

75
EcCommand.m
View file

@ -96,8 +96,7 @@ static NSString* cmdWord(NSArray* a, unsigned int pos)
NSDictionary *launchInfo; NSDictionary *launchInfo;
NSDictionary *environment; NSDictionary *environment;
NSMutableDictionary *launches; NSMutableDictionary *launches;
NSDate *past; NSMutableSet *launching;
NSDate *future;
unsigned pingPosition; unsigned pingPosition;
NSTimer *terminating; NSTimer *terminating;
NSDate *lastUnanswered; NSDate *lastUnanswered;
@ -662,7 +661,7 @@ static NSString* cmdWord(NSArray* a, unsigned int pos)
r = [self findIn: clients byName: key]; r = [self findIn: clients byName: key];
if (r == nil) if (r == nil)
{ {
[launches setObject: past forKey: key]; [launches setObject: [NSDate distantPast] forKey: key];
m = @"Ok - I will launch that program " m = @"Ok - I will launch that program "
@"when I get a chance.\n"; @"when I get a chance.\n";
} }
@ -740,7 +739,8 @@ static NSString* cmdWord(NSArray* a, unsigned int pos)
else if ([[inf objectForKey: @"Auto"] boolValue]==NO) else if ([[inf objectForKey: @"Auto"] boolValue]==NO)
{ {
date = [launches objectForKey: key]; date = [launches objectForKey: key];
if (date == nil || date == future) if (nil == date
|| [NSDate distantFuture] == date)
{ {
m = [m stringByAppendingString: m = [m stringByAppendingString:
@"may be launched manually\n"]; @"may be launched manually\n"];
@ -764,7 +764,7 @@ static NSString* cmdWord(NSArray* a, unsigned int pos)
date = now; date = now;
[launches setObject: date forKey: key]; [launches setObject: date forKey: key];
} }
if (date == future) if ([NSDate distantFuture] == date)
{ {
m = [m stringByAppendingString: m = [m stringByAppendingString:
@"manually suspended\n"]; @"manually suspended\n"];
@ -879,7 +879,8 @@ static NSString* cmdWord(NSArray* a, unsigned int pos)
NS_DURING NS_DURING
{ {
[launches setObject: future forKey: [c name]]; [launches setObject: [NSDate distantFuture]
forKey: [c name]];
m = [m stringByAppendingFormat: m = [m stringByAppendingFormat:
@"Sent 'quit' to '%@'\n", [c name]]; @"Sent 'quit' to '%@'\n", [c name]];
m = [m stringByAppendingString: m = [m stringByAppendingString:
@ -907,8 +908,9 @@ static NSString* cmdWord(NSArray* a, unsigned int pos)
NSDate *when = [launches objectForKey: key]; NSDate *when = [launches objectForKey: key];
found = YES; found = YES;
[launches setObject: future forKey: key]; [launches setObject: [NSDate distantFuture]
if (when != future) forKey: key];
if (when != [NSDate distantFuture])
{ {
m = [m stringByAppendingFormat: m = [m stringByAppendingFormat:
@"Suspended %@\n", key]; @"Suspended %@\n", key];
@ -1257,8 +1259,7 @@ static NSString* cmdWord(NSArray* a, unsigned int pos)
{ {
[timer invalidate]; [timer invalidate];
} }
RELEASE(past); RELEASE(launching);
RELEASE(future);
RELEASE(launches); RELEASE(launches);
DESTROY(control); DESTROY(control);
RELEASE(host); RELEASE(host);
@ -1440,8 +1441,7 @@ static NSString* cmdWord(NSArray* a, unsigned int pos)
host = RETAIN([[NSHost currentHost] name]); host = RETAIN([[NSHost currentHost] name]);
clients = [[NSMutableArray alloc] initWithCapacity: 10]; clients = [[NSMutableArray alloc] initWithCapacity: 10];
launches = [[NSMutableDictionary alloc] initWithCapacity: 10]; launches = [[NSMutableDictionary alloc] initWithCapacity: 10];
past = RETAIN([NSDate distantPast]); launching = [[NSMutableSet alloc] initWithCapacity: 10];
future = RETAIN([NSDate distantFuture]);
timer = [NSTimer scheduledTimerWithTimeInterval: 5.0 timer = [NSTimer scheduledTimerWithTimeInterval: 5.0
target: self target: self
@ -1481,7 +1481,7 @@ static NSString* cmdWord(NSArray* a, unsigned int pos)
if (disabled == NO) if (disabled == NO)
{ {
date = [launches objectForKey: key]; date = [launches objectForKey: key];
if (date == nil) if (nil == date)
{ {
if (autoLaunch == YES) if (autoLaunch == YES)
{ {
@ -1522,7 +1522,32 @@ static NSString* cmdWord(NSArray* a, unsigned int pos)
NSDictionary *addE = [taskInfo objectForKey: @"AddE"]; NSDictionary *addE = [taskInfo objectForKey: @"AddE"];
NSDictionary *setE = [taskInfo objectForKey: @"SetE"]; NSDictionary *setE = [taskInfo objectForKey: @"SetE"];
/* Record time of launch start and the fact that this is launching.
*/
[launches setObject: now forKey: key]; [launches setObject: now forKey: key];
if (nil == [launching member: key])
{
[launching addObject: key];
}
else
{
EcAlarm *a;
NSString *s;
/* We are re-attempting a launch of a program which never
* contacted us and registered with us ... raise an alarm.
*/
s = EcMakeManagedObject(host, key, nil);
a = [EcAlarm alarmForManagedObject: s
at: nil
withEventType: EcAlarmEventTypeProcessingError
probableCause: EcAlarmSoftwareProgramAbnormallyTerminated
specificProblem: @"Process availability"
perceivedSeverity: EcAlarmSeverityCritical
proposedRepairAction: @"Check system status"
additionalText: @"failed to register after launch"];
[control alarm: a];
}
if (prog != nil && [prog length] > 0) if (prog != nil && [prog length] > 0)
{ {
@ -1676,7 +1701,7 @@ static NSString* cmdWord(NSArray* a, unsigned int pos)
enumerator = [launchInfo keyEnumerator]; enumerator = [launchInfo keyEnumerator];
while ((key = [enumerator nextObject]) != nil) while ((key = [enumerator nextObject]) != nil)
{ {
[launches setObject: future forKey: key]; [launches setObject: [NSDate distantFuture] forKey: key];
} }
} }
@ -1705,7 +1730,7 @@ static NSString* cmdWord(NSArray* a, unsigned int pos)
{ {
NS_DURING NS_DURING
{ {
[launches setObject: future forKey: n]; [launches setObject: [NSDate distantFuture] forKey: n];
[[c obj] cmdQuit: 0]; [[c obj] cmdQuit: 0];
} }
NS_HANDLER NS_HANDLER
@ -1739,7 +1764,7 @@ static NSString* cmdWord(NSArray* a, unsigned int pos)
{ {
NS_DURING NS_DURING
{ {
[launches setObject: future forKey: n]; [launches setObject: [NSDate distantFuture] forKey: n];
[[c obj] cmdQuit: 0]; [[c obj] cmdQuit: 0];
} }
NS_HANDLER NS_HANDLER
@ -1820,13 +1845,19 @@ static NSString* cmdWord(NSArray* a, unsigned int pos)
[clients addObject: obj]; [clients addObject: obj];
RELEASE(obj); RELEASE(obj);
[clients sortUsingSelector: @selector(compare:)]; [clients sortUsingSelector: @selector(compare:)];
/* This client has launched ... remove it from the set of launching
* clients.
*/
[launching removeObject: n];
/* /*
* If this client is in the list of launchable clients, set * If this client is in the list of launchable clients, set
* it's last launch time to now so that if it dies it will * it's last launch time to now so that if it dies it will
* be restarted. This overrides any previous shutdown - we * be restarted. This overrides any previous shutdown - we
* assume that if it has been started by some process * assume that if it has been started by some process
* external to the Command server then we really don't want * external to the Command server then we really don't want
* it shut down. * it shut down.
*/ */
if ([launches objectForKey: n] != nil) if ([launches objectForKey: n] != nil)
{ {