Attachment 61748 Details for Bug 113171 – patch file

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] patch file

bugzilla113171[2].patch.txt (text/plain), 4.19 KB, created by Cindy Jin

on 2007-03-22 17:04:11 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Cindy Jin

Created: 2007-03-22 17:04:11 EDT

Size: 4.19 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.hyades.logging.adapter
>Index: src/org/eclipse/hyades/logging/adapter/outputters/CBELogOutputter.java
>===================================================================
>RCS file: /cvsroot/tptp/monitoring/org.eclipse.hyades.logging.adapter/src/org/eclipse/hyades/logging/adapter/outputters/CBELogOutputter.java,v
>retrieving revision 1.10
>diff -u -r1.10 CBELogOutputter.java
>--- src/org/eclipse/hyades/logging/adapter/outputters/CBELogOutputter.java	20 Sep 2006 02:59:52 -0000	1.10
>+++ src/org/eclipse/hyades/logging/adapter/outputters/CBELogOutputter.java	22 Mar 2007 21:03:19 -0000
>@@ -1,5 +1,5 @@
> /**********************************************************************
>- * Copyright (c) 2005,2006 IBM Corporation and others.
>+ * Copyright (c) 2005,2006,2007 IBM Corporation and others.
>  * All rights reserved.   This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -24,6 +24,7 @@
> import org.eclipse.hyades.logging.core.LoggingAgent;
> import org.eclipse.hyades.logging.events.cbe.CommonBaseEvent;
> import org.eclipse.hyades.logging.events.cbe.util.EventFormatter;
>+import org.eclipse.hyades.logging.adapter.util.Messages;
> import org.w3c.dom.Element;
> import org.w3c.dom.Node;
> import org.w3c.dom.NodeList;
>@@ -68,9 +69,19 @@
> 	private CommonBaseEvent[] processCBEs(CommonBaseEvent[] events)
> 	{
> 		int cbesReturned = 0;
>+		// If the Agent Controller is not available then just return because the
>+		// events cannot be sent to the client.
>+		if ( !cbelogger.isAgentControllerAvailable()) {
>+			// log a message
>+		    CommonBaseEvent event = getEventFactory().createCommonBaseEvent();
>+		    event.getMsgDataElement().setMsgCatalogId("HyadesGA_CBE_Log_Outputter_AgentControllerUnavailable_ERROR_");							    
>+			event.setSeverity(CommonBaseEvent.SEVERITY_CRITICAL);
>+			log(event);
>+			return events;
>+		}
> 
> 		// If the agent is not being monitored then wait for it to be so. Only wait if it is the first time.
>-		
>+				
> 		if (firstEvents && events.length > 0 && !cbelogger.isLogging() && waitTime >= 0) {
> 
> 		    CommonBaseEvent event = getEventFactory().createCommonBaseEvent();
>@@ -281,6 +292,11 @@
> 		}
> 		
> 		firstEvents = true;
>+		if (!cbelogger.isAgentControllerAvailable()) {
>+			// Agent Controller is not available so throw an exception
>+			throw new AdapterInvalidConfig(Messages.getString("HyadesGA_CBE_Log_Outputter_AgentControllerUnavailable_ERROR_"));
>+		}
>+
> 	}
> 
> 	/**
>Index: src/org/eclipse/hyades/logging/adapter/util/properties/messages.properties
>===================================================================
>RCS file: /cvsroot/tptp/monitoring/org.eclipse.hyades.logging.adapter/src/org/eclipse/hyades/logging/adapter/util/properties/messages.properties,v
>retrieving revision 1.6
>diff -u -r1.6 messages.properties
>--- src/org/eclipse/hyades/logging/adapter/util/properties/messages.properties	22 Mar 2007 06:03:38 -0000	1.6
>+++ src/org/eclipse/hyades/logging/adapter/util/properties/messages.properties	22 Mar 2007 21:03:19 -0000
>@@ -181,6 +181,8 @@
> HyadesGAContextInstanceConfiguration_Month_Value_Invalid_ERROR_ = IWAT0451E The value {0} of the attribute {1} of {2} is invalid.  It must be an integer value between 1 and 12.
> HyadesGAContextInstanceConfiguration_Day_Value_Invalid_ERROR_ = IWAT0452E The value {0} of the attribute {1} of {2} is invalid.  It must be an integer value between 1 and 31.
> HyadesGAContextInstanceConfiguration_Timezone_Value_Invalid_ERROR_ = IWAT0453E The value {0} of the attribute {1} of {2} is invalid.  It must be a timezone offset from GMT in the format specified in RFC 822.  For example, -0500.
>+HyadesGA_CBE_Log_Outputter_AgentControllerUnavailable_ERROR_=IWAT0323E Common Base Event Logging Agent outputter cannot communicate with Agent Controller. Ensure Agent Controller is running and Agent Controller native libraries are accessible.
>+
>  
> HyadesGABufferedPeriodicReader_Log_File_Read_Failed_ERROR_ = IWAT0476E Failed to read log file {0}.  Exception: {1}
> HyadesGABufferedPeriodicReader_No_Records_Read_ERROR_ = IWAT0477E No records were found in log file {0}.

Actions: View | Diff

Attachments on bug 113171: 28497 | 61748