Fix for https://issues.apache.org/activemq/browse/AMQ-1720

added the ability to get a callback when the broker is shutdown.  Also added an option to System.exit when the broker is shutdown.




git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@655639 13f79535-47bb-0310-9956-ffa450edef68

activemq-console/src/main/java/org/apache/activemq/console/Main.java

@@ -104,6 +104,7 @@ public class Main {
 
         try {
             app.runTaskClass(tokens);
+            System.exit(0);
         } catch (ClassNotFoundException e) {
             System.out.println("Could not load class: " + e.getMessage());
             try {
@@ -114,8 +115,10 @@ public class Main {
                 }
             } catch (MalformedURLException e1) {
             }
+            System.exit(1);
         } catch (Throwable e) {
             System.out.println("Failed to execute main task. Reason: " + e);
+            System.exit(1);
         }
     }
 

activemq-console/src/main/java/org/apache/activemq/console/command/StartCommand.java

@@ -22,6 +22,7 @@ import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import org.apache.activemq.broker.BrokerFactory;
 import org.apache.activemq.broker.BrokerService;
@@ -93,11 +94,14 @@ public class StartCommand extends AbstractCommand {
 
             // Prevent the main thread from exiting unless it is terminated
             // elsewhere
-            waitForShutdown();
         } catch (Exception e) {
             context.printException(new RuntimeException("Failed to execute start task. Reason: " + e, e));
             throw new Exception(e);
         }
+        
+        // The broker start up fine.  If this unblocks it's cause they were stopped
+        // and this would occur because of an internal error (like the DB going offline)
+        waitForShutdown();
     }
 
     /**
@@ -122,15 +126,34 @@ public class StartCommand extends AbstractCommand {
         final boolean[] shutdown = new boolean[] {
             false
         };
+        
         Runtime.getRuntime().addShutdownHook(new Thread() {
             public void run() {
-                synchronized (shutdown) {
+                for (Iterator<BrokerService> i = brokers.iterator(); i.hasNext();) {
-                    shutdown[0] = true;
+                    try {
-                    shutdown.notify();
+                        BrokerService broker = i.next();
+                        broker.stop();
+                    } catch (Exception e) {
+                    }
                 }
             }
         });
         
+        final AtomicInteger brokerCounter = new AtomicInteger(brokers.size());
+        for (BrokerService bs : brokers) {
+            bs.addShutdownHook(new Runnable() {
+                public void run() {
+                    // When the last broker lets us know he is closed....
+                    if( brokerCounter.decrementAndGet() == 0 ) {
+                        synchronized (shutdown) {
+                            shutdown[0] = true;
+                            shutdown.notify();
+                        }
+                    }
+                }
+            });
+        }
+
         // Wait for any shutdown event
         synchronized (shutdown) {
             while (!shutdown[0]) {
@@ -141,11 +164,6 @@ public class StartCommand extends AbstractCommand {
             }
         }
 
-        // Stop each broker
-        for (Iterator<BrokerService> i = brokers.iterator(); i.hasNext();) {
-            BrokerService broker = i.next();
-            broker.stop();
-        }
     }
 
     /**

activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java

@@ -170,7 +170,9 @@ public class BrokerService implements Service {
     private boolean dedicatedTaskRunner;
     private boolean cacheTempDestinations=false;//useful for failover
     private int timeBeforePurgeTempDestinations = 5000;
-   
+    private List<Runnable> shutdownHooks= new ArrayList<Runnable>();
+    private boolean systemExitOnShutdown;
+    private int systemExitOnShutdownExitCode;    
     
     static {
         String localHostName = "localhost";
@@ -425,6 +427,15 @@ public class BrokerService implements Service {
         }
 
         try {
+            
+            if( systemExitOnShutdown ) {
+                addShutdownHook(new Runnable(){
+                    public void run() {
+                        System.exit(systemExitOnShutdownExitCode);
+                    }
+                });
+            }
+            
             processHelperProperties();
 
             BrokerRegistry.getInstance().bind(getBrokerName(), this);
@@ -510,6 +521,15 @@ public class BrokerService implements Service {
         stopped.set(true);
         stoppedLatch.countDown();
         LOG.info("ActiveMQ JMS Message Broker (" + getBrokerName() + ", " + brokerId + ") stopped");
+        synchronized(shutdownHooks) {
+            for (Runnable hook : shutdownHooks) {
+                try {
+                    hook.run();
+                } catch ( Throwable e ) {
+                    stopper.onException(hook, e);
+                }
+            }
+        }
         stopper.throwFirstException();
     }
 
@@ -1912,4 +1932,25 @@ public class BrokerService implements Service {
         this.regionBroker = regionBroker;
     }
 
+    
+    public void addShutdownHook(Runnable hook) {
+        synchronized(shutdownHooks) {
+            shutdownHooks.add(hook);
+        }
+    }
+    
+    public void removeShutdownHook(Runnable hook) {
+        synchronized(shutdownHooks) {
+            shutdownHooks.remove(hook);
+        }
+    }
+
+    public boolean isSystemExitOnShutdown() {
+        return systemExitOnShutdown;
+    }
+
+    public void setSystemExitOnShutdown(boolean systemExitOnShutdown) {
+        this.systemExitOnShutdown = systemExitOnShutdown;
+    }
+    
 }

activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCPersistenceAdapter.java

@@ -473,7 +473,7 @@ public class JDBCPersistenceAdapter extends DataSourceSupport implements Persist
         try {
             brokerService.stop();
         } catch (Exception e) {
-            LOG.warn("Failed to stop broker");
+            LOG.warn("Failure occured while stopping broker");
         }
     }
 

activemq-core/src/main/java/org/apache/activemq/xbean/BrokerFactoryBean.java

@@ -52,6 +52,9 @@ public class BrokerFactoryBean implements FactoryBean, InitializingBean, Disposa
     private ResourceXmlApplicationContext context;
     private ApplicationContext parentContext;
     
+    private boolean systemExitOnShutdown;
+    private int systemExitOnShutdownExitCode;
+
     public BrokerFactoryBean() {
     }
 
@@ -101,6 +104,14 @@ public class BrokerFactoryBean implements FactoryBean, InitializingBean, Disposa
         if (broker == null) {
             throw new IllegalArgumentException("The configuration has no BrokerService instance for resource: " + config);
         }
+        
+        if( systemExitOnShutdown ) {
+            broker.addShutdownHook(new Runnable(){
+                public void run() {
+                    System.exit(systemExitOnShutdownExitCode);
+                }
+            });
+        }
         if (start) {
             broker.start();
         }
@@ -135,4 +146,28 @@ public class BrokerFactoryBean implements FactoryBean, InitializingBean, Disposa
         this.start = start;
     }
 
+    public boolean isSystemExitOnStop() {
+        return systemExitOnShutdown;
+    }
+
+    public void setSystemExitOnStop(boolean systemExitOnStop) {
+        this.systemExitOnShutdown = systemExitOnStop;
+    }
+
+    public boolean isSystemExitOnShutdown() {
+        return systemExitOnShutdown;
+    }
+
+    public void setSystemExitOnShutdown(boolean systemExitOnShutdown) {
+        this.systemExitOnShutdown = systemExitOnShutdown;
+    }
+
+    public int getSystemExitOnShutdownExitCode() {
+        return systemExitOnShutdownExitCode;
+    }
+
+    public void setSystemExitOnShutdownExitCode(int systemExitOnShutdownExitCode) {
+        this.systemExitOnShutdownExitCode = systemExitOnShutdownExitCode;
+    }
+
 }