From e95bc542fb011f3465a23e994ffa3bc530dffd30 Mon Sep 17 00:00:00 2001
From: Sami Korhonen <skorhone@gmail.com>
Date: Fri, 22 Apr 2016 00:09:54 +0300
Subject: [PATCH] Fixed issue #110: Changed GelfHandler's close to comply with
 Handler interface specification

---
 pom.xml                                       |  4 +-
 .../org/graylog2/logging/GelfHandler.java     | 83 +++++++++++--------
 2 files changed, 49 insertions(+), 38 deletions(-)

diff --git a/pom.xml b/pom.xml
index ed81529..158e3ef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,12 +12,12 @@
         <connection>scm:git:git@github.com:t0xa/gelfj.git</connection>
         <developerConnection>scm:git:git@github.com:t0xa/gelfj.git</developerConnection>
         <url>git@github.com:t0xa/gelfj.git</url>
-        <tag>v1.1.15</tag>
+        <tag>HEAD</tag>
     </scm>
 
     <groupId>org.graylog2</groupId>
     <artifactId>gelfj</artifactId>
-    <version>1.1.15</version>
+    <version>1.1.16-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>gelfj</name>
     <description>GELF implementation in Java and log4j appender without any dependencies.</description>
diff --git a/src/main/java/org/graylog2/logging/GelfHandler.java b/src/main/java/org/graylog2/logging/GelfHandler.java
index a28dc07..7307b18 100644
--- a/src/main/java/org/graylog2/logging/GelfHandler.java
+++ b/src/main/java/org/graylog2/logging/GelfHandler.java
@@ -32,6 +32,7 @@ public class GelfHandler
     private GelfSender gelfSender;
     private boolean extractStacktrace;
     private Map<String, String> fields;
+    private volatile boolean closed;
 
     public GelfHandler() {
         final LogManager manager = LogManager.getLogManager();
@@ -115,42 +116,15 @@ private String getLocalHostName() {
     }
 
     @Override
-    public synchronized void publish(final LogRecord record) {
-        if (!isLoggable(record)) {
-            return;
+    public void publish(final LogRecord record) {
+        if (!closed && isLoggable(record)) {
+            send(record);
         }
+    }
+    
+    private synchronized void send(LogRecord record) {
         if (null == gelfSender) {
-            if (graylogHost == null && amqpURI == null) {
-                reportError("Graylog2 hostname and amqp uri are empty!", null, ErrorManager.WRITE_FAILURE);
-            } else if (graylogHost != null && amqpURI != null) {
-                reportError("Graylog2 hostname and amqp uri are both informed!", null, ErrorManager.WRITE_FAILURE);
-            } else {
-                try {
-                    if (graylogHost.startsWith("tcp:")) {
-                        String tcpGraylogHost = graylogHost.substring(4, graylogHost.length());
-                        gelfSender = new GelfTCPSender(tcpGraylogHost, graylogPort);
-                    } else if (graylogHost.startsWith("udp:")) {
-                        String udpGraylogHost = graylogHost.substring(4, graylogHost.length());
-                        gelfSender = new GelfUDPSender(udpGraylogHost, graylogPort);
-                    } else if (amqpURI != null) {
-                        gelfSender = new GelfAMQPSender(amqpURI, amqpExchangeName, amqpRoutingKey, amqpMaxRetries);
-                    } else {
-                        gelfSender = new GelfUDPSender(graylogHost, graylogPort);
-                    }
-                } catch (UnknownHostException e) {
-                    reportError("Unknown Graylog2 hostname:" + graylogHost, e, ErrorManager.WRITE_FAILURE);
-                } catch (SocketException e) {
-                    reportError("Socket exception", e, ErrorManager.WRITE_FAILURE);
-                } catch (IOException e) {
-                    reportError("IO exception", e, ErrorManager.WRITE_FAILURE);
-                } catch (URISyntaxException e) {
-                    reportError("AMQP uri exception", e, ErrorManager.WRITE_FAILURE);
-                } catch (NoSuchAlgorithmException e) {
-                    reportError("AMQP algorithm exception", e, ErrorManager.WRITE_FAILURE);
-                } catch (KeyManagementException e) {
-                    reportError("AMQP key exception", e, ErrorManager.WRITE_FAILURE);
-                }
-            }
+        	gelfSender = createSender();
         }
         if (null == gelfSender) {
             reportError("Could not send GELF message", null, ErrorManager.WRITE_FAILURE);
@@ -160,14 +134,51 @@ public synchronized void publish(final LogRecord record) {
                 reportError("Error during sending GELF message. Error code: " + gelfSenderResult.getCode() + ".", gelfSenderResult.getException(), ErrorManager.WRITE_FAILURE);
             }
         }
+	}
+    
+    private GelfSender createSender() {
+    	GelfSender gelfSender = null;
+        if (graylogHost == null && amqpURI == null) {
+            reportError("Graylog2 hostname and amqp uri are empty!", null, ErrorManager.WRITE_FAILURE);
+        } else if (graylogHost != null && amqpURI != null) {
+            reportError("Graylog2 hostname and amqp uri are both informed!", null, ErrorManager.WRITE_FAILURE);
+        } else {
+            try {
+                if (graylogHost.startsWith("tcp:")) {
+                    String tcpGraylogHost = graylogHost.substring(4, graylogHost.length());
+                    gelfSender = new GelfTCPSender(tcpGraylogHost, graylogPort);
+                } else if (graylogHost.startsWith("udp:")) {
+                    String udpGraylogHost = graylogHost.substring(4, graylogHost.length());
+                    gelfSender = new GelfUDPSender(udpGraylogHost, graylogPort);
+                } else if (amqpURI != null) {
+                    gelfSender = new GelfAMQPSender(amqpURI, amqpExchangeName, amqpRoutingKey, amqpMaxRetries);
+                } else {
+                    gelfSender = new GelfUDPSender(graylogHost, graylogPort);
+                }
+            } catch (UnknownHostException e) {
+                reportError("Unknown Graylog2 hostname:" + graylogHost, e, ErrorManager.WRITE_FAILURE);
+            } catch (SocketException e) {
+                reportError("Socket exception", e, ErrorManager.WRITE_FAILURE);
+            } catch (IOException e) {
+                reportError("IO exception", e, ErrorManager.WRITE_FAILURE);
+            } catch (URISyntaxException e) {
+                reportError("AMQP uri exception", e, ErrorManager.WRITE_FAILURE);
+            } catch (NoSuchAlgorithmException e) {
+                reportError("AMQP algorithm exception", e, ErrorManager.WRITE_FAILURE);
+            } catch (KeyManagementException e) {
+                reportError("AMQP key exception", e, ErrorManager.WRITE_FAILURE);
+            }
+        }
+        return gelfSender;
     }
 
-    @Override
-    public void close() {
+	@Override
+    public synchronized void close() {
         if (null != gelfSender) {
             gelfSender.close();
             gelfSender = null;
         }
+        closed = true;
     }
 
     private GelfMessage makeMessage(final LogRecord record) {