Target Explorer: Filter messages of type 'F' (framework internal) from default logging

3 files changed, 13 insertions, 0 deletions

diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.log.core/src/org/eclipse/tcf/te/tcf/log/core/interfaces/IPreferenceKeys.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.log.core/src/org/eclipse/tcf/te/tcf/log/core/interfaces/IPreferenceKeys.java
index 226a31052..0490269cb 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.log.core/src/org/eclipse/tcf/te/tcf/log/core/interfaces/IPreferenceKeys.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.log.core/src/org/eclipse/tcf/te/tcf/log/core/interfaces/IPreferenceKeys.java
@@ -30,6 +30,11 @@ public interface IPreferenceKeys {
 	public final String PREF_SHOW_HEARTBEATS = PREFIX + "show.heartbeats"; //$NON-NLS-1$
 
 	/**
+	 * If set to <code>true</code>, TCF framework events are logged.
+	 */
+	public final String PREF_SHOW_FRAMEWORK_EVENTS = PREFIX + "show.frameworkEvents"; //$NON-NLS-1$
+
+	/**
 	 * The maximum number of bytes the log files are allowed to grow to, in bytes.
 	 * Defaults to 5MB.
 	 */
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.log.core/src/org/eclipse/tcf/te/tcf/log/core/internal/PreferencesInitializer.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.log.core/src/org/eclipse/tcf/te/tcf/log/core/internal/PreferencesInitializer.java
index 5207de915..4c7bfa0b1 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.log.core/src/org/eclipse/tcf/te/tcf/log/core/internal/PreferencesInitializer.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.log.core/src/org/eclipse/tcf/te/tcf/log/core/internal/PreferencesInitializer.java
@@ -40,6 +40,8 @@ public class PreferencesInitializer extends AbstractPreferenceInitializer {
 			prefs.putBoolean(IPreferenceKeys.PREF_LOGGING_ENABLED, true);
 			// [Hidden] Heat beat events: default off
 			prefs.putBoolean(IPreferenceKeys.PREF_SHOW_HEARTBEATS, false);
+			// [Hidden] Framework events: default off
+			prefs.putBoolean(IPreferenceKeys.PREF_SHOW_FRAMEWORK_EVENTS, false);
 			// [Hidden] Maximum log file size in bytes: default 5M
 			prefs.put(IPreferenceKeys.PREF_MAX_FILE_SIZE, "5M"); //$NON-NLS-1$
 			// [Hidden] Maximum number of log files in cycle: default 5
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.log.core/src/org/eclipse/tcf/te/tcf/log/core/internal/listener/ChannelTraceListener.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.log.core/src/org/eclipse/tcf/te/tcf/log/core/internal/listener/ChannelTraceListener.java
index 8aade7bd5..2ffba07b7 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.log.core/src/org/eclipse/tcf/te/tcf/log/core/internal/listener/ChannelTraceListener.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.log.core/src/org/eclipse/tcf/te/tcf/log/core/internal/listener/ChannelTraceListener.java
@@ -124,6 +124,12 @@ public class ChannelTraceListener implements TraceListener {
 		if (!showHeartbeats && name != null && name.toLowerCase().contains("heartbeat")) { //$NON-NLS-1$
 			return;
 		}
+		// Filter out framework events if not overwritten by the preferences
+		boolean frameworkEvents = Platform.getPreferencesService().getBoolean(CoreBundleActivator.getUniqueIdentifier(),
+						 													  IPreferenceKeys.PREF_SHOW_FRAMEWORK_EVENTS, false, null);
+		if (!frameworkEvents && type == 'F') {
+			return;
+		}
 
 		// Format the message
 		final String message = formatMessage(type, token, service, name, data, received);