You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rp...@apache.org on 2016/09/04 07:22:15 UTC
[27/50] logging-log4j2 git commit: Immediate flush setting is not
used by the manager factory.
Immediate flush setting is not used by the manager factory.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/0a924217
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/0a924217
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/0a924217
Branch: refs/heads/LOG4J2-1349-gcfree-threadcontext
Commit: 0a924217d31f8606ea04999ad5f50bb4e1f3ea0f
Parents: ae7c2f0
Author: ggregory <gg...@apache.org>
Authored: Thu Sep 1 11:56:19 2016 -0700
Committer: ggregory <gg...@apache.org>
Committed: Thu Sep 1 11:56:19 2016 -0700
----------------------------------------------------------------------
.../logging/log4j/core/appender/FileAppender.java | 2 +-
.../logging/log4j/core/appender/FileManager.java | 13 ++++---------
2 files changed, 5 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0a924217/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java
index b42f9da..6b035cd 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java
@@ -87,7 +87,7 @@ public final class FileAppender extends AbstractOutputStreamAppender<FileManager
Layout<? extends Serializable> layout = getOrCreateLayout();
final FileManager manager = FileManager.getFileManager(fileName, append, locking, bufferedIo, createOnDemand,
- advertiseUri, layout, bufferSize, isImmediateFlush(), configuration);
+ advertiseUri, layout, bufferSize, configuration);
if (manager == null) {
return null;
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0a924217/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileManager.java
index d38281a..cb8e2ed 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileManager.java
@@ -97,20 +97,18 @@ public class FileManager extends OutputStreamManager {
* @param advertiseUri the URI to use when advertising the file
* @param layout The layout
* @param bufferSize buffer size for buffered IO
- * @param immediateFlush true if the contents should be flushed on every write, false otherwise.
* @param configuration The configuration.
* @return A FileManager for the File.
*/
public static FileManager getFileManager(final String fileName, final boolean append, boolean locking,
final boolean bufferedIo, final boolean createOnDemand, final String advertiseUri,
- final Layout<? extends Serializable> layout, final int bufferSize, final boolean immediateFlush,
- Configuration configuration) {
+ final Layout<? extends Serializable> layout, final int bufferSize, Configuration configuration) {
if (locking && bufferedIo) {
locking = false;
}
return (FileManager) getManager(fileName, new FactoryData(append, locking, bufferedIo, bufferSize,
- immediateFlush, createOnDemand, advertiseUri, layout, configuration), FACTORY);
+ createOnDemand, advertiseUri, layout, configuration), FACTORY);
}
@Override
@@ -205,7 +203,6 @@ public class FileManager extends OutputStreamManager {
private final boolean locking;
private final boolean bufferedIo;
private final int bufferSize;
- private final boolean immediateFlush;
private final boolean createOnDemand;
private final String advertiseURI;
private final Layout<? extends Serializable> layout;
@@ -216,21 +213,19 @@ public class FileManager extends OutputStreamManager {
* @param locking Locking status.
* @param bufferedIo Buffering flag.
* @param bufferSize Buffer size.
- * @param immediateFlush flush on every write or not
* @param createOnDemand if you want to lazy-create the file (a.k.a. on-demand.)
* @param advertiseURI the URI to use when advertising the file
* @param layout The layout
* @param configuration the configuration
*/
public FactoryData(final boolean append, final boolean locking, final boolean bufferedIo, final int bufferSize,
- final boolean immediateFlush, final boolean createOnDemand, final String advertiseURI,
- final Layout<? extends Serializable> layout, Configuration configuration) {
+ final boolean createOnDemand, final String advertiseURI, final Layout<? extends Serializable> layout,
+ Configuration configuration) {
super(configuration);
this.append = append;
this.locking = locking;
this.bufferedIo = bufferedIo;
this.bufferSize = bufferSize;
- this.immediateFlush = immediateFlush;
this.createOnDemand = createOnDemand;
this.advertiseURI = advertiseURI;
this.layout = layout;