Attachment 65274 Details for Bug 135531 – patch file

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

patch file

patch(2).txt (text/plain), 4.55 KB, created by Cindy Jin

on 2007-04-27 17:25:58 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Cindy Jin

Created: 2007-04-27 17:25:58 EDT

Size: 4.55 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.hyades.logging.adapter
>Index: src/org/eclipse/hyades/logging/adapter/impl/BasicContext.java
>===================================================================
>RCS file: /cvsroot/tptp/monitoring/org.eclipse.hyades.logging.adapter/src/org/eclipse/hyades/logging/adapter/impl/BasicContext.java,v
>retrieving revision 1.8
>diff -u -r1.8 BasicContext.java
>--- src/org/eclipse/hyades/logging/adapter/impl/BasicContext.java	29 Sep 2006 19:29:09 -0000	1.8
>+++ src/org/eclipse/hyades/logging/adapter/impl/BasicContext.java	27 Apr 2007 21:25:19 -0000
>@@ -13,11 +13,16 @@
> import org.eclipse.hyades.logging.adapter.AdapterException;
> import org.eclipse.hyades.logging.adapter.AdapterInvalidConfig;
> import org.eclipse.hyades.logging.adapter.IComponent;
>+import org.eclipse.hyades.logging.adapter.IFilter;
>+import org.eclipse.hyades.logging.adapter.IFormatter;
>+import org.eclipse.hyades.logging.adapter.IOutputter;
>+import org.eclipse.hyades.logging.adapter.IParser;
> import org.eclipse.hyades.logging.adapter.IProcessUnit;
> import org.eclipse.hyades.logging.adapter.ISensor;
> import org.eclipse.hyades.logging.adapter.util.Messages;
> import org.eclipse.hyades.logging.events.cbe.CommonBaseEvent;
> import org.eclipse.hyades.logging.events.cbe.Situation;
>+import org.eclipse.hyades.logging.adapter.impl.Component;
> /**
>  * BasicContext provide the simplest possible implementation of a Context.
>  * It is a good example for other custom context implementation
>@@ -316,9 +321,12 @@
> 				/* Don't let the listener break us */
> 			}	
> 		}
>+		ISensor sensor= ((ISensor) getComponents()[0]);
>+		
> 		 
> 		Object[] flushedSensorContent=((ISensor) getComponents()[0]).flush();
> 		
>+		
> 		if(listener!=null && !isHardStop()) {
> 			try {
> 				listener.postProcessEventItems(getComponents()[0], flushedSensorContent);
>@@ -329,7 +337,51 @@
> 		}
> 		
> 		flushMessages(flushedSensorContent, 1);
>-		super.stop();
>+		//bugziila 135531, If the items processed by sensor is bigger than 0, 
>+		//but case1: there is the formatter component, its count of processed items is 0,
>+		//           An information message is logged to indicate that it may because of wrong type of log file.
>+		//    case2: there is no formatter component and no filter component, check the output component,
>+		//           if its count of processed items is 0
>+		//           An information message is logged to indicate that it may because of wrong type of log file.
>+		IComponent compentets[] = getComponents();
>+		boolean containsFilter = false;
>+		boolean containsFormatter = false;
>+		if (((Component) (getComponents()[0])).getItemsProcessedCount() > 0) {
>+				for (int i = 1; i < compentets.length; i++) {
>+
>+					if (getComponents()[i] instanceof IFilter) {
>+						containsFilter = true;
>+
>+					} else if (getComponents()[i] instanceof IFormatter) {
>+						containsFormatter = true;
>+                       
>+						if (!containsFilter && ((Component) (compentets[i])).getItemsProcessedCount() == 0) {
>+							CommonBaseEvent event = getEventFactory().createCommonBaseEvent();
>+							event.setMsg(Messages.getString("INVALID_LOG_TYPE_INFO_"));
>+							event.setSeverity(CommonBaseEvent.SEVERITY_FATAL);
>+							log(event);
>+							
>+						}
>+						break;
>+					} else if (getComponents()[i] instanceof IOutputter) {
>+						if (!containsFilter && !containsFormatter) {
>+
>+							if (((Component) (compentets[i])).getItemsProcessedCount() == 0) {
>+								CommonBaseEvent event = getEventFactory().createCommonBaseEvent();
>+								event.setMsg(Messages.getString("INVALID_LOG_TYPE_INFO_"));
>+								event.setSeverity(CommonBaseEvent.SEVERITY_FATAL);
>+								log(event);
>+
>+							}
>+						}
>+
>+					}
>+				}
>+
>+			}
>+			super.stop();
>+		
>+		
> 	}
> 	/**
> 	 * flushMessages flushes any messages cached by a component to the next component.
>Index: src/org/eclipse/hyades/logging/adapter/extractors/SimpleExtractor.java
>===================================================================
>RCS file: /cvsroot/tptp/monitoring/org.eclipse.hyades.logging.adapter/src/org/eclipse/hyades/logging/adapter/extractors/SimpleExtractor.java,v
>retrieving revision 1.6
>diff -u -r1.6 SimpleExtractor.java
>--- src/org/eclipse/hyades/logging/adapter/extractors/SimpleExtractor.java	17 Feb 2006 18:22:14 -0000	1.6
>+++ src/org/eclipse/hyades/logging/adapter/extractors/SimpleExtractor.java	27 Apr 2007 21:25:19 -0000
>@@ -201,6 +201,7 @@
> 				
> 			}
> 			//no filter against the records
>+			incrementItemsProcessedCount(tmpMessages.length);
> 			return tmpMessages;
> 			
> 		}

Actions: View

Attachments on bug 135531: 60669 | 65274 | 65276