You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2014/09/05 07:59:12 UTC
[1/3] git commit: Format.
Repository: logging-log4j2
Updated Branches:
refs/heads/master 0176c88bc -> ace0ef29c
Format.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/8fdcf7bd
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/8fdcf7bd
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/8fdcf7bd
Branch: refs/heads/master
Commit: 8fdcf7bd988c5c5b870e696cf9b1b997721777e3
Parents: 0176c88
Author: Gary Gregory <ga...@gmail.com>
Authored: Fri Sep 5 01:56:19 2014 -0400
Committer: Gary Gregory <ga...@gmail.com>
Committed: Fri Sep 5 01:56:19 2014 -0400
----------------------------------------------------------------------
.../java/org/apache/logging/log4j/core/layout/SyslogLayout.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/8fdcf7bd/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java
index 8834f79..0fe2833 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java
@@ -114,8 +114,7 @@ public final class SyslogLayout extends AbstractStringLayout {
* @return Map of content format keys supporting SyslogLayout
*/
@Override
- public Map<String, String> getContentFormat()
- {
+ public Map<String, String> getContentFormat() {
final Map<String, String> result = new HashMap<String, String>();
result.put("structured", "false");
result.put("formatType", "logfilepatternreceiver");
[2/3] git commit: Sort methods in AB order.
Posted by gg...@apache.org.
Sort methods in AB order.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/9cc0c612
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/9cc0c612
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/9cc0c612
Branch: refs/heads/master
Commit: 9cc0c612b9324229aa14766103d474e9bd9089f1
Parents: 8fdcf7b
Author: Gary Gregory <ga...@gmail.com>
Authored: Fri Sep 5 01:57:04 2014 -0400
Committer: Gary Gregory <ga...@gmail.com>
Committed: Fri Sep 5 01:57:04 2014 -0400
----------------------------------------------------------------------
.../log4j/core/layout/AbstractLayout.java | 38 ++++++++++----------
1 file changed, 19 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/9cc0c612/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractLayout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractLayout.java
index e39ce3f..4b560fa 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractLayout.java
@@ -31,20 +31,6 @@ import org.apache.logging.log4j.status.StatusLogger;
public abstract class AbstractLayout<T extends Serializable> implements Layout<T> {
/**
- * Constructs a layout with an optional header and footer.
- *
- * @param header
- * The header to include when the stream is opened. May be null.
- * @param footer
- * The footer to add when the stream is closed. May be null.
- */
- public AbstractLayout(byte[] header, byte[] footer) {
- super();
- this.header = header;
- this.footer = footer;
- }
-
- /**
* Allow subclasses access to the status logger without creating another instance.
*/
protected static final Logger LOGGER = StatusLogger.getLogger();
@@ -60,13 +46,17 @@ public abstract class AbstractLayout<T extends Serializable> implements Layout<T
protected final byte[] footer;
/**
- * Returns the header, if one is available.
+ * Constructs a layout with an optional header and footer.
*
- * @return A byte array containing the header.
+ * @param header
+ * The header to include when the stream is opened. May be null.
+ * @param footer
+ * The footer to add when the stream is closed. May be null.
*/
- @Override
- public byte[] getHeader() {
- return header;
+ public AbstractLayout(byte[] header, byte[] footer) {
+ super();
+ this.header = header;
+ this.footer = footer;
}
/**
@@ -78,4 +68,14 @@ public abstract class AbstractLayout<T extends Serializable> implements Layout<T
public byte[] getFooter() {
return footer;
}
+
+ /**
+ * Returns the header, if one is available.
+ *
+ * @return A byte array containing the header.
+ */
+ @Override
+ public byte[] getHeader() {
+ return header;
+ }
}
[3/3] git commit: Format.
Posted by gg...@apache.org.
Format.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/ace0ef29
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/ace0ef29
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/ace0ef29
Branch: refs/heads/master
Commit: ace0ef29c03ca4fdc20f4d9acf415a53699a515f
Parents: 9cc0c61
Author: Gary Gregory <ga...@gmail.com>
Authored: Fri Sep 5 01:59:04 2014 -0400
Committer: Gary Gregory <ga...@gmail.com>
Committed: Fri Sep 5 01:59:04 2014 -0400
----------------------------------------------------------------------
.../org/apache/logging/log4j/core/net/AbstractSocketManager.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ace0ef29/log4j-core/src/main/java/org/apache/logging/log4j/core/net/AbstractSocketManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/AbstractSocketManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/AbstractSocketManager.java
index 033b2a1..54a4bcd 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/AbstractSocketManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/AbstractSocketManager.java
@@ -68,12 +68,10 @@ public abstract class AbstractSocketManager extends OutputStreamManager {
* @return Map of content format keys supporting AbstractSocketManager
*/
@Override
- public Map<String, String> getContentFormat()
- {
+ public Map<String, String> getContentFormat() {
final Map<String, String> result = new HashMap<String, String>(super.getContentFormat());
result.put("port", Integer.toString(port));
result.put("address", inetAddress.getHostAddress());
-
return result;
}
}