Target Explorer: Write a messages to stderr (in debug mode) if the log file cycling fails

3 files changed, 13 insertions, 5 deletions

diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.log.core/src/org/eclipse/tcf/te/tcf/log/core/internal/LogManager.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.log.core/src/org/eclipse/tcf/te/tcf/log/core/internal/LogManager.java
index ed2e2585d..22dc5d81b 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.log.core/src/org/eclipse/tcf/te/tcf/log/core/internal/LogManager.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.log.core/src/org/eclipse/tcf/te/tcf/log/core/internal/LogManager.java
@@ -21,6 +21,7 @@ import java.util.Map;
 import org.eclipse.core.runtime.Assert;

 import org.eclipse.core.runtime.IPath;

 import org.eclipse.core.runtime.Path;

+import org.eclipse.core.runtime.Platform;

 import org.eclipse.osgi.util.NLS;

 import org.eclipse.tcf.protocol.IChannel;

 import org.eclipse.tcf.protocol.IPeer;

@@ -84,7 +85,7 @@ public final class LogManager implements IProtocolStateChangeListener {
 	 * Dispose the log manager instance.

 	 */

 	public void dispose() {

-		String message = NLS.bind(Messages.ChannelTraceListener_logManagerDispose_message,

+		String message = NLS.bind(Messages.LogManager_dispose_message,

 								  DATE_FORMAT.format(new Date(System.currentTimeMillis())));

 		for (FileWriter writer : fileWriterMap.values()) {

 			try {

@@ -380,7 +381,9 @@ public final class LogManager implements IProtocolStateChangeListener {
 								// Rename the log file if the rotate succeeded,

 								// Delete the log file if not.

 								rc = rc ? file.renameTo(maxFileInCycle) : file.delete();

-								if (!rc) { /* Well, there is nothing we can do about it */ }

+								if (!rc && Platform.inDebugMode()) {

+									System.err.println(NLS.bind(Messages.LogManager_error_renameFailed, fullPath.toOSString(), maxFileInCycle.getAbsolutePath()));

+								}

 							}

 

 						} else {

@@ -395,7 +398,9 @@ public final class LogManager implements IProtocolStateChangeListener {
 

 							// Rename the log file

 							boolean rc = file.renameTo(fileInCycle);

-							if (!rc) { /* Well, there is nothing we can do about it */ }

+							if (!rc && Platform.inDebugMode()) {

+								System.err.println(NLS.bind(Messages.LogManager_error_renameFailed, fullPath.toOSString(), fileInCycle.getAbsolutePath()));

+							}

 						}

 					}

 				}

diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.log.core/src/org/eclipse/tcf/te/tcf/log/core/internal/nls/Messages.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.log.core/src/org/eclipse/tcf/te/tcf/log/core/internal/nls/Messages.java
index bf4ce6edf..e86e70b21 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.log.core/src/org/eclipse/tcf/te/tcf/log/core/internal/nls/Messages.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.log.core/src/org/eclipse/tcf/te/tcf/log/core/internal/nls/Messages.java
@@ -31,6 +31,7 @@ public class Messages extends NLS {
 
 	public static String ChannelTraceListener_channelOpened_message;
 	public static String ChannelTraceListener_channelClosed_message;
-	public static String ChannelTraceListener_logManagerDispose_message;
 
+	public static String LogManager_dispose_message;
+	public static String LogManager_error_renameFailed;
 }
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.log.core/src/org/eclipse/tcf/te/tcf/log/core/internal/nls/Messages.properties b/target_explorer/plugins/org.eclipse.tcf.te.tcf.log.core/src/org/eclipse/tcf/te/tcf/log/core/internal/nls/Messages.properties
index 16eb1a6f3..868c0ebea 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.log.core/src/org/eclipse/tcf/te/tcf/log/core/internal/nls/Messages.properties
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.log.core/src/org/eclipse/tcf/te/tcf/log/core/internal/nls/Messages.properties
@@ -10,4 +10,6 @@
 
 ChannelTraceListener_channelOpened_message=# {0}: Opened channel {1}
 ChannelTraceListener_channelClosed_message=# {0}: Closed channel {1} (error={2})
-ChannelTraceListener_logManagerDispose_message=# {0}: Closed session
+
+LogManager_dispose_message=# {0}: Closed session
+LogManager_error_renameFailed=Failed to rename file while cycling the log files.\n\nFrom: {0}\nTo: {1}