Add yet more debugging

io7m-com · Apr 27, 2023 · 97823a7 · 97823a7
1 parent e89c872
commit 97823a7
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 2 deletions.
diff --git a/...7m.hibiscus.basic/src/main/java/com/io7m/hibiscus/basic/HBClientAsynchronousAbstract.java b/...7m.hibiscus.basic/src/main/java/com/io7m/hibiscus/basic/HBClientAsynchronousAbstract.java
@@ -153,6 +153,10 @@ private void executeClose(
      */
 
     try {
+      if (LOG.isTraceEnabled()) {
+        LOG.trace("close op executing");
+      }
+
       this.operationQueue.forEach(op -> {
         if (!Objects.equals(close.future, op.future())) {
           op.future().cancel(true);
@@ -161,9 +165,13 @@ private void executeClose(
       try {
         this.delegate.close();
       } catch (final Exception e) {
-        LOG.debug("close: ", e);
+        LOG.debug("close op: ", e);
       }
     } finally {
+      if (LOG.isTraceEnabled()) {
+        LOG.trace("close op shutting down executor");
+      }
+
       this.commandExecutor.shutdown();
 
       try {
@@ -173,6 +181,10 @@ private void executeClose(
       }
 
       close.future.complete(null);
+
+      if (LOG.isTraceEnabled()) {
+        LOG.trace("close op completed");
+      }
     }
   }
 
@@ -295,12 +307,24 @@ public final CompletableFuture<Void> disconnectAsync()
   @Override
   public final void close()
   {
+    if (LOG.isTraceEnabled()) {
+      LOG.trace("close requested");
+    }
+
     if (this.closed.compareAndSet(false, true)) {
+      if (LOG.isTraceEnabled()) {
+        LOG.trace("close scheduled");
+      }
+
       final var future =
         CompletableFuture.completedFuture(null);
       this.operationQueue.add(new OpType.Close<>(future));
+
       try {
         future.get();
+        if (LOG.isTraceEnabled()) {
+          LOG.trace("close future completed");
+        }
       } catch (final InterruptedException e) {
         Thread.currentThread().interrupt();
       } catch (final ExecutionException e) {

diff --git a/...o7m.hibiscus.basic/src/main/java/com/io7m/hibiscus/basic/HBClientSynchronousAbstract.java b/...o7m.hibiscus.basic/src/main/java/com/io7m/hibiscus/basic/HBClientSynchronousAbstract.java
@@ -287,6 +287,10 @@ public final void disconnect()
   @Override
   public final void close()
   {
+    if (LOG.isTraceEnabled()) {
+      LOG.trace("close requested");
+    }
+
     synchronized (this.stateLock) {
       final var state = this.stateNow;
       if (state == CLIENT_CLOSING || state == CLIENT_CLOSED) {
@@ -297,7 +301,7 @@ public final void close()
 
     try {
       if (LOG.isTraceEnabled()) {
-        LOG.trace("close");
+        LOG.trace("close starting");
       }
 
       this.statePublisher.submit(CLIENT_CLOSED);