diff --git a/src/main/java/nonapi/io/github/classgraph/classloaderhandler/lifecycle/SpringLifeCycleListener.java b/src/main/java/nonapi/io/github/classgraph/classloaderhandler/lifecycle/SpringLifeCycleListener.java
index 961fc05e7..2501eca12 100644
--- a/src/main/java/nonapi/io/github/classgraph/classloaderhandler/lifecycle/SpringLifeCycleListener.java
+++ b/src/main/java/nonapi/io/github/classgraph/classloaderhandler/lifecycle/SpringLifeCycleListener.java
@@ -28,6 +28,8 @@
  */
 package nonapi.io.github.classgraph.classloaderhandler.lifecycle;
 
+import java.util.logging.Logger;
+
 import javax.servlet.ServletContextEvent;
 import javax.servlet.ServletContextListener;
 
@@ -52,6 +54,9 @@ public class SpringLifeCycleListener {
     ServletListenerRegistrationBean<ServletContextListener> servletListener() {
         final ServletListenerRegistrationBean<ServletContextListener> srb = new ServletListenerRegistrationBean<>();
         srb.setListener(new ServletContextListener() {
+            /** The logger. */
+            private final Logger log = Logger.getLogger(ClassGraph.class.getName());
+
             /**
              * Context initialized.
              *
@@ -60,6 +65,7 @@ ServletListenerRegistrationBean<ServletContextListener> servletListener() {
              */
             @Override
             public void contextInitialized(final ServletContextEvent event) {
+                log.info("Spring container detected -- disabling ClassGraph shutdown hook");
                 ClassGraph.disableShutdownHook();
             }
 
@@ -72,6 +78,7 @@ public void contextInitialized(final ServletContextEvent event) {
             @Override
             public void contextDestroyed(final ServletContextEvent event) {
                 // Cleanly close down any open {@link ScanResult} instances.
+                log.info("Closing any remaning open ClassGraph ScanResult instances");
                 ScanResult.closeAll();
             }
         });
diff --git a/src/main/java/nonapi/io/github/classgraph/classloaderhandler/lifecycle/TomcatLifeCycleListener.java b/src/main/java/nonapi/io/github/classgraph/classloaderhandler/lifecycle/TomcatLifeCycleListener.java
index 0f1c2bc53..77edeac26 100644
--- a/src/main/java/nonapi/io/github/classgraph/classloaderhandler/lifecycle/TomcatLifeCycleListener.java
+++ b/src/main/java/nonapi/io/github/classgraph/classloaderhandler/lifecycle/TomcatLifeCycleListener.java
@@ -28,6 +28,8 @@
  */
 package nonapi.io.github.classgraph.classloaderhandler.lifecycle;
 
+import java.util.logging.Logger;
+
 import javax.servlet.ServletContextEvent;
 import javax.servlet.ServletContextListener;
 import javax.servlet.annotation.WebListener;
@@ -45,6 +47,9 @@
  */
 @WebListener
 public class TomcatLifeCycleListener implements ServletContextListener {
+    /** The logger. */
+    private final Logger log = Logger.getLogger(ClassGraph.class.getName());
+
     /**
      * Context initialized.
      *
@@ -53,6 +58,7 @@ public class TomcatLifeCycleListener implements ServletContextListener {
      */
     @Override
     public void contextInitialized(final ServletContextEvent event) {
+        log.info("Tomcat container detected -- disabling ClassGraph shutdown hook");
         ClassGraph.disableShutdownHook();
     }
 
@@ -65,6 +71,7 @@ public void contextInitialized(final ServletContextEvent event) {
     @Override
     public void contextDestroyed(final ServletContextEvent event) {
         // Cleanly close down any open {@link ScanResult} instances.
+        log.info("Closing any remaning open ClassGraph ScanResult instances");
         ScanResult.closeAll();
     }
 }
\ No newline at end of file
diff --git a/src/main/java/nonapi/io/github/classgraph/utils/LogNode.java b/src/main/java/nonapi/io/github/classgraph/utils/LogNode.java
index 954f0a23e..361f67c57 100644
--- a/src/main/java/nonapi/io/github/classgraph/utils/LogNode.java
+++ b/src/main/java/nonapi/io/github/classgraph/utils/LogNode.java
@@ -49,8 +49,7 @@
  * retain a sane order. The order may also be made deterministic by specifying a sort key for log entries.
  */
 public final class LogNode {
-
-    /** The Constant log. */
+    /** The logger. */
     private static final Logger log = Logger.getLogger(ClassGraph.class.getName());
 
     /**