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

include component in alerts generated from alarms

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/devmodules/dev-libs/ec@35173 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2012-06-01 10:06:26 +00:00
parent a82da0c7ba
commit 5673486572
1 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
EcControl.m
View file

@ -388,6 +388,7 @@ static NSString* cmdWord(NSArray* a, unsigned int pos)
|| EcAlarmSeverityMinor == severity) || EcAlarmSeverityMinor == severity)
{ {
NSString *additional; NSString *additional;
NSString *component;
NSString *connector; NSString *connector;
NSString *instance; NSString *instance;
NSString *message; NSString *message;
@ -406,6 +407,16 @@ static NSString* cmdWord(NSArray* a, unsigned int pos)
connector = @"-"; connector = @"-";
} }
component = [alarm moComponent];
if (0 == [component length])
{
component = @"";
}
else
{
component = [NSString stringWithFormat: @"(%@)", component];
}
additional = [alarm additionalText]; additional = [alarm additionalText];
if ([additional length] == 0) if ([additional length] == 0)
{ {
@ -432,17 +443,17 @@ static NSString* cmdWord(NSArray* a, unsigned int pos)
if (EcAlarmSeverityCritical == severity) if (EcAlarmSeverityCritical == severity)
{ {
message = [NSString stringWithFormat: cmdLogFormat(LT_ALERT, message = [NSString stringWithFormat: cmdLogFormat(LT_ALERT,
@"%@%@%@%@%@ - '%@%@%@' on %@"), @"%@%@%@%@%@ - '%@%@%@%@' on %@"),
[alarm specificProblem], spacing1, additional, spacing2, repair, [alarm specificProblem], spacing1, additional, spacing2, repair,
[alarm moProcess], connector, instance, [alarm moHost]]; [alarm moProcess], connector, instance, component, [alarm moHost]];
[self information: message type: LT_ALERT to: nil from: nil]; [self information: message type: LT_ALERT to: nil from: nil];
} }
else if (EcAlarmSeverityMajor == severity) else if (EcAlarmSeverityMajor == severity)
{ {
message = [NSString stringWithFormat: cmdLogFormat(LT_ERROR, message = [NSString stringWithFormat: cmdLogFormat(LT_ERROR,
@"%@%@%@%@%@ - '%@%@%@' on %@"), @"%@%@%@%@%@ - '%@%@%@%@' on %@"),
[alarm specificProblem], spacing1, additional, spacing2, repair, [alarm specificProblem], spacing1, additional, spacing2, repair,
[alarm moProcess], connector, instance, [alarm moHost]]; [alarm moProcess], connector, instance, component, [alarm moHost]];
[self information: message type: LT_ERROR to: nil from: nil]; [self information: message type: LT_ERROR to: nil from: nil];
} }
} }