Merge pull request #16 from ShaneMcC/onClosed

Add onClosed event handler.
launchdarkly · Jan 25, 2017 · 1f09ffc · 1f09ffc
2 parents ab02c93 + 8195085
commit 1f09ffc
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 0 deletions.
diff --git a/src/main/java/com/launchdarkly/eventsource/AsyncEventHandler.java b/src/main/java/com/launchdarkly/eventsource/AsyncEventHandler.java
@@ -27,6 +27,18 @@ public void run() {
     });
   }
 
+  public void onClosed() {
+    executor.execute(new Runnable() {
+      public void run() {
+        try {
+          eventSourceHandler.onClosed();
+        } catch (Exception e) {
+          onError(e);
+        }
+      }
+    });
+  }
+
   public void onComment(final String comment) {
     executor.execute(new Runnable() {
       public void run() {

diff --git a/src/main/java/com/launchdarkly/eventsource/EventHandler.java b/src/main/java/com/launchdarkly/eventsource/EventHandler.java
@@ -2,6 +2,7 @@
 
 public interface EventHandler {
   void onOpen() throws Exception;
+  void onClosed() throws Exception;
   void onMessage(String event, MessageEvent messageEvent) throws Exception;
   void onComment(String comment) throws Exception;
   void onError(Throwable t);

diff --git a/src/main/java/com/launchdarkly/eventsource/EventSource.java b/src/main/java/com/launchdarkly/eventsource/EventSource.java
@@ -87,6 +87,13 @@ public void close() throws IOException {
     if (currentState == SHUTDOWN) {
       return;
     }
+    if (currentState == ReadyState.OPEN) {
+      try {
+        handler.onClosed();
+      } catch (Exception e) {
+        handler.onError(e);
+      }
+    }
     executor.shutdownNow();
 
     if (client != null) {
@@ -154,6 +161,13 @@ private void connect() {
           if (call != null) {
             call.cancel();
           }
+          if (currentState == ReadyState.OPEN) {
+            try {
+              handler.onClosed();
+            } catch (Exception e) {
+              handler.onError(e);
+            }
+          }
         }
       }
     } catch (RejectedExecutionException ignored) {