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

Fixups for recording more audit info on loss of process

Browse source
This commit is contained in:
Richard Frith-Macdonald 2020-07-17 19:07:35 +01:00
parent 394368873e
commit 680dcdfbf0
1 changed files with 37 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
EcCommand.m
View file

@ -233,10 +233,6 @@ desiredName(Desired state)
*/ */
Desired desired; // If process *should* be live/dead Desired desired; // If process *should* be live/dead
/** Records the readson for the desired state.
*/
NSString *desiredReason;
/** The timestamp at which the current startup operation began, or zero /** The timestamp at which the current startup operation began, or zero
* if the process is not currently starting. * if the process is not currently starting.
*/ */
@ -339,6 +335,14 @@ desiredName(Desired state)
*/ */
NSString *restartReason; // Reason for restart or nil NSString *restartReason; // Reason for restart or nil
/** Records the reason we desire the process to be started.
*/
NSString *startedReason;
/** Records the reason we desire the process to be stopped.
*/
NSString *stoppedReason;
/** Records the names of other processes which must be active in order for /** Records the names of other processes which must be active in order for
* this process to work. Any attempt to start this process will result in * this process to work. Any attempt to start this process will result in
* it remaining in a queue of starting processes until all the dependencies * it remaining in a queue of starting processes until all the dependencies
@ -903,7 +907,8 @@ desiredName(Desired state)
[[NSNotificationCenter defaultCenter] removeObserver: self]; [[NSNotificationCenter defaultCenter] removeObserver: self];
[startingTimer invalidate]; [startingTimer invalidate];
[stoppingTimer invalidate]; [stoppingTimer invalidate];
RELEASE(desiredReason); RELEASE(startedReason);
RELEASE(stoppedReason);
RELEASE(restartReason); RELEASE(restartReason);
RELEASE(dependencies); RELEASE(dependencies);
RELEASE(client); RELEASE(client);
@ -1351,7 +1356,7 @@ desiredName(Desired state)
} }
else if ([self autolaunch] && 0.0 == clientQuitDate) else if ([self autolaunch] && 0.0 == clientQuitDate)
{ {
ASSIGN(desiredReason, @"autolaunch"); ASSIGN(startedReason, @"autolaunch");
/* If the config says we autolaunch and the last process /* If the config says we autolaunch and the last process
* didn't shut down cleanly, we should start. * didn't shut down cleanly, we should start.
*/ */
@ -1377,6 +1382,7 @@ desiredName(Desired state)
if (NO == [self isStopping]) if (NO == [self isStopping])
{ {
ASSIGNCOPY(restartReason, reason); ASSIGNCOPY(restartReason, reason);
ASSIGNCOPY(stoppedReason, @"Console restart command");
[self stop]; [self stop];
} }
} }
@ -1389,9 +1395,9 @@ desiredName(Desired state)
- (void) started - (void) started
{ {
EcCommand *command = (EcCommand*)EcProc; EcCommand *command = (EcCommand*)EcProc;
NSString *reason = AUTORELEASE(desiredReason); NSString *reason = AUTORELEASE(startedReason);
desiredReason = nil; startedReason = nil;
if (nil == reason) if (nil == reason)
{ {
reason = @"started externally"; reason = @"started externally";
@ -1512,8 +1518,15 @@ desiredName(Desired state)
{ {
Desired old = desired; Desired old = desired;
ASSIGNCOPY(desiredReason, reason);
desired = state; desired = state;
if (Live == desired)
{
ASSIGNCOPY(startedReason, reason);
}
if (Dead == desired)
{
ASSIGNCOPY(stoppedReason, reason);
}
if (terminateBy != nil && desired != Dead) if (terminateBy != nil && desired != Dead)
{ {
desired = Dead; desired = Dead;
@ -1942,12 +1955,24 @@ desiredName(Desired state)
if (clientLostDate > 0.0 || clientQuitDate > 0.0) if (clientLostDate > 0.0 || clientQuitDate > 0.0)
{ {
NSString *reason = AUTORELEASE(desiredReason); NSString *reason = AUTORELEASE(stoppedReason);
desiredReason = nil; stoppedReason = nil;
if (nil == reason) if (nil == reason)
{ {
reason = @"stopped externally"; if (terminationStatusKnown && terminationStatus != 0)
{
reason = [NSString stringWithFormat:
@"stopped (died with signal %d)", terminationStatus];
}
else if (clientLostDate > 0.0)
{
reason = @"stopped (process lost)";
}
else
{
reason = @"stopped externally";
}
} }
if (clientLostDate > 0.0) if (clientLostDate > 0.0)