Removed caching of the DNS resolution - the code will now rely on the… (

#124)

* Removed caching of the DNS resolution - the code will now rely on the JVM's cache instead and rely on the networkaddress.cache.ttl security property;
For the UDP sender, also added a refresh of the channel every 5 minutes - otherwise the same channel would keep sending to the same IP forever.

Signed-off-by: Gaspard Petit <[email protected]>

* Fixed the refresh from 30 seconds to 5 mins :)

Signed-off-by: Gaspard Petit <[email protected]>

src/main/java/org/graylog2/GelfTCPSender.java

@@ -2,11 +2,11 @@
 
 import java.io.IOException;
 import java.io.OutputStream;
-import java.net.*;
+import java.net.Socket;
 
 public class GelfTCPSender implements GelfSender {
 	private boolean shutdown = false;
-	private InetAddress host;
+	private String host;
 	private int port;
 	private Socket socket;
     private OutputStream os;
@@ -15,7 +15,7 @@ public GelfTCPSender() {
     }
 
 	public GelfTCPSender(String host, int port) throws IOException {
-		this.host = InetAddress.getByName(host);
+		this.host = host;
 		this.port = port;
 		this.socket = new Socket(host, port);
         this.os = socket.getOutputStream();

src/main/java/org/graylog2/GelfUDPSender.java

@@ -1,18 +1,20 @@
 package org.graylog2;
 
 import java.io.IOException;
-import java.net.*;
+import java.net.InetSocketAddress;
 import java.nio.ByteBuffer;
-import java.nio.channels.ClosedChannelException;
 import java.nio.channels.DatagramChannel;
+import java.util.Date;
 
 public class GelfUDPSender implements GelfSender {
 
-	private InetAddress host;
+	private String host;
 	private int port;
 	private DatagramChannel channel;
+	private Date lastChannelRefresh = null;
 
 	private static final int MAX_RETRIES = 5;
+	private static final int REFRESH_CHANNEL_SECONDS = 300;
 
     public GelfUDPSender() {
     }
@@ -22,7 +24,7 @@ public GelfUDPSender(String host) throws IOException {
 	}
 
 	public GelfUDPSender(String host, int port) throws IOException {
-		this.host = InetAddress.getByName(host);
+		this.host = host;
 		this.port = port;
 		setChannel(initiateChannel());
 	}
@@ -49,6 +51,10 @@ private GelfSenderResult sendDatagrams(ByteBuffer[] bytesList) {
 
 			try {
 
+				if (isChannelOld() ) {
+					getChannel().close();
+				}
+
 				if (!getChannel().isOpen()) {
 					setChannel(initiateChannel());
 				}
@@ -81,5 +87,17 @@ public DatagramChannel getChannel() {
 
     public void setChannel(DatagramChannel channel) {
         this.channel = channel;
+        this.lastChannelRefresh = new Date();
+    }
+
+    private boolean isChannelOld() {
+    	if (this.lastChannelRefresh == null)
+    		return true;
+
+    	Date now = new Date();
+    	if ((now.getTime() - REFRESH_CHANNEL_SECONDS * 1000) > this.lastChannelRefresh.getTime())
+    		return true;
+
+    	return false;
     }
 }