You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by cs...@apache.org on 2017/07/31 07:59:22 UTC
[3/6] karaf git commit: [KARAF-5267] Documentation and move flush to
correct position
[KARAF-5267] Documentation and move flush to correct position
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/fd4f6400
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/fd4f6400
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/fd4f6400
Branch: refs/heads/karaf-4.1.x
Commit: fd4f64006a0efe2a461af225124d25ad33b22a25
Parents: 5c0800e
Author: Christian Schneider <ch...@die-schneider.net>
Authored: Fri Jul 21 12:09:41 2017 +0200
Committer: Christian Schneider <ch...@die-schneider.net>
Committed: Mon Jul 31 09:25:48 2017 +0200
----------------------------------------------------------------------
log/src/main/java/org/apache/karaf/log/command/DisplayLog.java | 2 --
log/src/main/java/org/apache/karaf/log/command/LogTail.java | 2 ++
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/fd4f6400/log/src/main/java/org/apache/karaf/log/command/DisplayLog.java
----------------------------------------------------------------------
diff --git a/log/src/main/java/org/apache/karaf/log/command/DisplayLog.java b/log/src/main/java/org/apache/karaf/log/command/DisplayLog.java
index 82aec16..076b8ec 100644
--- a/log/src/main/java/org/apache/karaf/log/command/DisplayLog.java
+++ b/log/src/main/java/org/apache/karaf/log/command/DisplayLog.java
@@ -74,12 +74,10 @@ public class DisplayLog implements Action {
}
protected void display(final PrintStream out, int minLevel) {
-
Iterable<PaxLoggingEvent> le = logService.getEvents(entries == 0 ? Integer.MAX_VALUE : entries);
for (PaxLoggingEvent event : le) {
printEvent(out, event, minLevel);
}
- out.flush();
}
protected static int getMinLevel(String levelSt) {
http://git-wip-us.apache.org/repos/asf/karaf/blob/fd4f6400/log/src/main/java/org/apache/karaf/log/command/LogTail.java
----------------------------------------------------------------------
diff --git a/log/src/main/java/org/apache/karaf/log/command/LogTail.java b/log/src/main/java/org/apache/karaf/log/command/LogTail.java
index 8cd70f8..00d5a2b 100644
--- a/log/src/main/java/org/apache/karaf/log/command/LogTail.java
+++ b/log/src/main/java/org/apache/karaf/log/command/LogTail.java
@@ -41,8 +41,10 @@ public class LogTail extends DisplayLog {
@Override
public Object execute() throws Exception {
int minLevel = getMinLevel(level);
+ // Do not use System.out as it may write to the wrong console depending on the thread that calls our log handler
PrintStream out = session.getConsole();
display(out, minLevel);
+ out.flush();
PaxAppender appender = event -> printEvent(out, event, minLevel);
ServiceTracker<LogService, LogService> tracker = new ServiceTracker<LogService, LogService>(context, LogService.class, null) {