From 56734865729289137ef4f616a073716fb7bc8c69 Mon Sep 17 00:00:00 2001
From: Richard Frith-MacDonald <rfm@gnu.org>
Date: Fri, 1 Jun 2012 10:06:26 +0000
Subject: [PATCH] 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
---
 EcControl.m | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/EcControl.m b/EcControl.m
index adeec7f..69bde9d 100644
--- a/EcControl.m
+++ b/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];
 	}
     }