mirror of
https://github.com/gnustep/libs-ec.git
synced 2025-02-20 18:32:09 +00:00
include component in alerts generated from alarms
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:
parent
a82da0c7ba
commit
5673486572
1 changed files with 15 additions and 4 deletions
19
EcControl.m
19
EcControl.m
|
@ -388,6 +388,7 @@ static NSString* cmdWord(NSArray* a, unsigned int pos)
|
|||
|| EcAlarmSeverityMinor == severity)
|
||||
{
|
||||
NSString *additional;
|
||||
NSString *component;
|
||||
NSString *connector;
|
||||
NSString *instance;
|
||||
NSString *message;
|
||||
|
@ -406,6 +407,16 @@ static NSString* cmdWord(NSArray* a, unsigned int pos)
|
|||
connector = @"-";
|
||||
}
|
||||
|
||||
component = [alarm moComponent];
|
||||
if (0 == [component length])
|
||||
{
|
||||
component = @"";
|
||||
}
|
||||
else
|
||||
{
|
||||
component = [NSString stringWithFormat: @"(%@)", component];
|
||||
}
|
||||
|
||||
additional = [alarm additionalText];
|
||||
if ([additional length] == 0)
|
||||
{
|
||||
|
@ -432,17 +443,17 @@ static NSString* cmdWord(NSArray* a, unsigned int pos)
|
|||
if (EcAlarmSeverityCritical == severity)
|
||||
{
|
||||
message = [NSString stringWithFormat: cmdLogFormat(LT_ALERT,
|
||||
@"%@%@%@%@%@ - '%@%@%@' on %@"),
|
||||
@"%@%@%@%@%@ - '%@%@%@%@' on %@"),
|
||||
[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];
|
||||
}
|
||||
else if (EcAlarmSeverityMajor == severity)
|
||||
{
|
||||
message = [NSString stringWithFormat: cmdLogFormat(LT_ERROR,
|
||||
@"%@%@%@%@%@ - '%@%@%@' on %@"),
|
||||
@"%@%@%@%@%@ - '%@%@%@%@' on %@"),
|
||||
[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];
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue