diff --git a/src/main/java/org/graylog2/syslog4j/SyslogConstants.java b/src/main/java/org/graylog2/syslog4j/SyslogConstants.java index c034667..3ded474 100644 --- a/src/main/java/org/graylog2/syslog4j/SyslogConstants.java +++ b/src/main/java/org/graylog2/syslog4j/SyslogConstants.java @@ -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"; diff --git a/src/main/java/org/graylog2/syslog4j/impl/AbstractSyslog.java b/src/main/java/org/graylog2/syslog4j/impl/AbstractSyslog.java index 80fab35..b7bdc37 100644 --- a/src/main/java/org/graylog2/syslog4j/impl/AbstractSyslog.java +++ b/src/main/java/org/graylog2/syslog4j/impl/AbstractSyslog.java @@ -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) { diff --git a/src/main/java/org/graylog2/syslog4j/impl/AbstractSyslogConfig.java b/src/main/java/org/graylog2/syslog4j/impl/AbstractSyslogConfig.java index d659bfa..5704c54 100644 --- a/src/main/java/org/graylog2/syslog4j/impl/AbstractSyslogConfig.java +++ b/src/main/java/org/graylog2/syslog4j/impl/AbstractSyslogConfig.java @@ -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() { diff --git a/src/main/java/org/graylog2/syslog4j/impl/AbstractSyslogConfigIF.java b/src/main/java/org/graylog2/syslog4j/impl/AbstractSyslogConfigIF.java index 08e0471..07a17f9 100644 --- a/src/main/java/org/graylog2/syslog4j/impl/AbstractSyslogConfigIF.java +++ b/src/main/java/org/graylog2/syslog4j/impl/AbstractSyslogConfigIF.java @@ -62,8 +62,4 @@ public interface AbstractSyslogConfigIF extends SyslogConfigIF { * @param maxQueueSize */ public void setMaxQueueSize(int maxQueueSize); - - public int getMinMessageLength(); - - public void setMinMessageLength(int minMessageLength); }