Ldong/syslog4j-graylog2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Removed the min length limitation (missunderstood rfc)

Browse Source
This commit is contained in:
Negar Safinianaini 2016-02-15 10:50:07 +01:00
parent ec7df03bce
commit 999568c5da
4 changed files with 1 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/org/graylog2/syslog4j/SyslogConstants.java
View File

@ -26,7 +26,6 @@ public interface SyslogConstants extends Serializable {
public static final String STRUCTURED_DATA_EMPTY_VALUE = "[0@0]";
public static final String SYSLOG_DATEFORMAT_RFC5424 = "yyyy-MM-dd'T'HH:mm:ss'Z'";
public static final int MAX_MESSAGE_LENGTH_RFC5424 = 2048;
public static final int MIN_MESSAGE_LENGTH_RFC5424 = 480;
public static final String CHAR_SET_DEFAULT = "UTF-8";

8
src/main/java/org/graylog2/syslog4j/impl/AbstractSyslog.java
View File

@ -288,14 +288,8 @@ public abstract class AbstractSyslog implements SyslogIF {
byte[] m = SyslogUtility.getBytes(this.syslogConfig, message);
int mLength = m.length;
int hLength = h.length;
int expectedMinLength = this.syslogConfig.getMinMessageLength();
if (mLength < expectedMinLength) {
throw new SyslogRuntimeException("Message length is: " + String.valueOf(mLength) + " but expected to be at least: " + String.valueOf(expectedMinLength));
}
int availableLen = this.syslogConfig.getMaxMessageLength() - hLength;
int availableLen = this.syslogConfig.getMaxMessageLength() - h.length;
if (this.syslogConfig.isTruncateMessage()) {
if (availableLen > 0 && mLength > availableLen) {

10
src/main/java/org/graylog2/syslog4j/impl/AbstractSyslogConfig.java
View File

@ -46,7 +46,6 @@ public abstract class AbstractSyslogConfig implements AbstractSyslogConfigIF {
protected boolean throwExceptionOnInitialize = THROW_EXCEPTION_ON_INITIALIZE_DEFAULT;
protected int maxMessageLength = MAX_MESSAGE_LENGTH_DEFAULT;
protected int minMessageLength = 0;
protected byte[] splitMessageBeginText = SPLIT_MESSAGE_BEGIN_TEXT_DEFAULT.getBytes();
protected byte[] splitMessageEndText = SPLIT_MESSAGE_END_TEXT_DEFAULT.getBytes();
@ -129,14 +128,6 @@ public abstract class AbstractSyslogConfig implements AbstractSyslogConfigIF {
public void setMaxMessageLength(int maxMessageLength) {
this.maxMessageLength = maxMessageLength;
}
public int getMinMessageLength() {
return this.minMessageLength;
}
public void setMinMessageLength(int minMessageLength) {
this.minMessageLength = minMessageLength;
}
public boolean isSendLocalTimestamp() {
return this.sendLocalTimestamp;
@ -381,7 +372,6 @@ public abstract class AbstractSyslogConfig implements AbstractSyslogConfigIF {
public void setUseStructuredData(boolean useStructuredData) {
this.useStructuredData = useStructuredData;
setMaxMessageLength(SyslogConstants.MAX_MESSAGE_LENGTH_RFC5424);
setMinMessageLength(SyslogConstants.MIN_MESSAGE_LENGTH_RFC5424);
}
public Class getSyslogWriterClass() {

4
src/main/java/org/graylog2/syslog4j/impl/AbstractSyslogConfigIF.java
View File

@ -62,8 +62,4 @@ public interface AbstractSyslogConfigIF extends SyslogConfigIF {
* @param maxQueueSize
*/
public void setMaxQueueSize(int maxQueueSize);
public int getMinMessageLength();
public void setMinMessageLength(int minMessageLength);
}