You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2018/09/28 18:44:29 UTC
[geode] branch develop updated: GEODE-2644: Use LINE_SEPARATOR in
logging classes (#2525)
This is an automated email from the ASF dual-hosted git repository.
klund pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new 78c4aac GEODE-2644: Use LINE_SEPARATOR in logging classes (#2525)
78c4aac is described below
commit 78c4aac8dc18e43f26b14013e106e2c8a7b4c982
Author: Kirk Lund <kl...@apache.org>
AuthorDate: Fri Sep 28 11:44:21 2018 -0700
GEODE-2644: Use LINE_SEPARATOR in logging classes (#2525)
Use org.apache.commons.lang.SystemUtils.LINE_SEPARATOR instead of \n.
---
.../apache/geode/internal/logging/LogFileParser.java | 10 ++++++----
.../apache/geode/internal/logging/LogWriterImpl.java | 17 +++++++++++------
.../apache/geode/internal/logging/MergeLogFiles.java | 4 +++-
.../org/apache/geode/internal/logging/SortLogFile.java | 4 ++--
4 files changed, 22 insertions(+), 13 deletions(-)
diff --git a/geode-core/src/main/java/org/apache/geode/internal/logging/LogFileParser.java b/geode-core/src/main/java/org/apache/geode/internal/logging/LogFileParser.java
index 665d967..7f10879 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/logging/LogFileParser.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/logging/LogFileParser.java
@@ -14,6 +14,8 @@
*/
package org.apache.geode.internal.logging;
+import static org.apache.commons.lang.SystemUtils.LINE_SEPARATOR;
+
import java.io.BufferedReader;
import java.io.FileReader;
import java.io.IOException;
@@ -287,7 +289,7 @@ public class LogFileParser {
if (idx > 0) {
idx = line.indexOf("]", idx + 4);
if (idx + 1 < line.length()) {
- line.insert(idx + 1, "\n ");
+ line.insert(idx + 1, LINE_SEPARATOR + " ");
}
}
}
@@ -335,7 +337,7 @@ public class LogFileParser {
}
sb.append("[dump ");
sb.append(timestamp);
- sb.append("]\n\n");
+ sb.append("]").append(LINE_SEPARATOR).append(LINE_SEPARATOR);
} catch (ParseException ex) {
// Oh well...
@@ -346,7 +348,7 @@ public class LogFileParser {
}
sb.append(line);
- sb.append("\n");
+ sb.append(LINE_SEPARATOR);
if (entry != null) {
return entry;
@@ -366,7 +368,7 @@ public class LogFileParser {
LocalLogWriter tempLogger = new LocalLogWriter(InternalLogWriter.ALL_LEVEL, pw);
tempLogger.info(LocalizedStrings.LogFileParser_MISSING_TIME_STAMP);
pw.flush();
- sb.insert(0, "\n\n");
+ sb.insert(0, LINE_SEPARATOR + LINE_SEPARATOR);
sb.insert(0, sw.toString().trim());
sb.insert(0, this.extLogFileName);
}
diff --git a/geode-core/src/main/java/org/apache/geode/internal/logging/LogWriterImpl.java b/geode-core/src/main/java/org/apache/geode/internal/logging/LogWriterImpl.java
index 0819af7..742b9fc 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/logging/LogWriterImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/logging/LogWriterImpl.java
@@ -14,6 +14,8 @@
*/
package org.apache.geode.internal.logging;
+import static org.apache.commons.lang.SystemUtils.LINE_SEPARATOR;
+
import java.io.PrintWriter;
import java.io.StringWriter;
import java.text.BreakIterator;
@@ -975,6 +977,9 @@ public abstract class LogWriterImpl implements InternalLogWriter {
public abstract void put(int messageLevel, StringId messageId, Object[] parameters,
Throwable throwable);
+ /**
+ * formatText manipulates \n and \r chars but supports Windows and Linux/Unix/Mac
+ */
static void formatText(PrintWriter writer, String target, int initialLength) {
BreakIterator boundary = BreakIterator.getLineInstance();
boundary.setText(target);
@@ -1102,13 +1107,13 @@ public abstract class LogWriterImpl implements InternalLogWriter {
sb.append("[trace ").append(getTimeStamp()).append("] ");
}
StackTraceElement[] els = targetThread.getStackTrace();
- sb.append("Stack trace for '").append(targetThread).append("'\n");
+ sb.append("Stack trace for '").append(targetThread).append("'").append(LINE_SEPARATOR);
if (els.length > 0) {
for (int i = 0; i < els.length; i++) {
- sb.append("\tat ").append(els[i]).append("\n");
+ sb.append("\tat ").append(els[i]).append(LINE_SEPARATOR);
}
} else {
- sb.append(" no stack\n");
+ sb.append(" no stack").append(LINE_SEPARATOR);
}
if (toStdout) {
System.out.println(sb);
@@ -1126,13 +1131,13 @@ public abstract class LogWriterImpl implements InternalLogWriter {
public static StringBuilder getStackTrace(Thread targetThread) {
StringBuilder sb = new StringBuilder(500);
StackTraceElement[] els = targetThread.getStackTrace();
- sb.append("Stack trace for '").append(targetThread).append("'\n");
+ sb.append("Stack trace for '").append(targetThread).append("'").append(LINE_SEPARATOR);
if (els.length > 0) {
for (int i = 0; i < els.length; i++) {
- sb.append("\tat ").append(els[i]).append("\n");
+ sb.append("\tat ").append(els[i]).append(LINE_SEPARATOR);
}
} else {
- sb.append(" no stack\n");
+ sb.append(" no stack").append(LINE_SEPARATOR);
}
return sb;
}
diff --git a/geode-core/src/main/java/org/apache/geode/internal/logging/MergeLogFiles.java b/geode-core/src/main/java/org/apache/geode/internal/logging/MergeLogFiles.java
index 5f2cdc7..c2a6894 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/logging/MergeLogFiles.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/logging/MergeLogFiles.java
@@ -14,6 +14,8 @@
*/
package org.apache.geode.internal.logging;
+import static org.apache.commons.lang.SystemUtils.LINE_SEPARATOR;
+
import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
@@ -145,7 +147,7 @@ public class MergeLogFiles {
private static void usage(String s) {
// note that we don't document the -pids switch because it is tailored
// to how hydra works and would not be useful for customers
- err.println("\n** " + s + "\n");
+ err.println(LINE_SEPARATOR + "** " + s + LINE_SEPARATOR);
err.println(LocalizedStrings.MergeLogFiles_USAGE.toLocalizedString()
+ ": java MergeLogFiles [(directory | logFile)]+");
err.println("-dirCount n "
diff --git a/geode-core/src/main/java/org/apache/geode/internal/logging/SortLogFile.java b/geode-core/src/main/java/org/apache/geode/internal/logging/SortLogFile.java
index bc70bab..6a243a2 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/logging/SortLogFile.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/logging/SortLogFile.java
@@ -14,6 +14,7 @@
*/
package org.apache.geode.internal.logging;
+import static org.apache.commons.lang.SystemUtils.LINE_SEPARATOR;
import java.io.BufferedReader;
import java.io.File;
@@ -44,7 +45,6 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
* @since GemFire 3.0
*/
public class SortLogFile {
-
private static PrintStream out = System.out;
private static PrintStream err = System.err;
@@ -91,7 +91,7 @@ public class SortLogFile {
* Prints usage information about this program
*/
private static void usage(String s) {
- err.println("\n** " + s + "\n");
+ err.println(LINE_SEPARATOR + "** " + s + LINE_SEPARATOR);
err.println(
LocalizedStrings.SortLogFile_USAGE.toLocalizedString() + ": java SortLogFile logFile");
err.println("-sortedFile file "