Changeset e064b0a

Timestamp:

Aug 29, 2008 1:12:55 PM (12 years ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

ee4d68c

Parents:

c321251

Message:

• Shutdown: Call the shutdown hooks before the router shutdown rather than after

File:

• router/java/src/net/i2p/router/Router.java (modified) (2 diffs)

router/java/src/net/i2p/router/Router.java

@@ -797 +797 @@
         _context.random().saveSeed();
         I2PThread.removeOOMEventListener(_oomListener);
+        // Run the shutdown hooks first in case they want to send some goodbye messages
+        // Maybe we need a delay after this too?
+        try {
+            for (Iterator iter = _shutdownTasks.iterator(); iter.hasNext(); ) {
+                Runnable task = (Runnable)iter.next();
+                task.run();
+            }
+        } catch (Throwable t) {
+            _log.log(Log.CRIT, "Error running shutdown task", t);
+        }
         try { _context.jobQueue().shutdown(); } catch (Throwable t) { _log.log(Log.CRIT, "Error shutting down the job queue", t); }
         //try { _context.adminManager().shutdown(); } catch (Throwable t) { _log.log(Log.CRIT, "Error shutting down the admin manager", t); }        
@@ -812 +822 @@
         RouterContext.listContexts().remove(_context);
         dumpStats();
-        try {
-            for (Iterator iter = _shutdownTasks.iterator(); iter.hasNext(); ) {
-                Runnable task = (Runnable)iter.next();
-                task.run();
-            }
-        } catch (Throwable t) {
-            _log.log(Log.CRIT, "Error running shutdown task", t);
-        }
         finalShutdown(exitCode);
     }