Changeset 27

Timestamp:

05/28/13 18:21:37 (11 years ago)

Author:

stoda

Message:

 

Location:

trunk/objectmq

Files:

• .classpath (modified) (1 diff)
• src/omq/common/broker/Broker.java (modified) (3 diffs)
• src/omq/ztest/calculator/ClientTest.java (modified) (1 diff)
• test (added)
• test/test (added)
• test/test/Client.java (added)
• test/test/ClientImpl.java (added)

trunk/objectmq/.classpath

@@ -2 +2 @@
 <classpath>
         <classpathentry kind="src" path="src"/>
+        <classpathentry kind="src" path="test"/>
         <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
         <classpathentry kind="lib" path="lib/gson-2.2.3.jar"/>

trunk/objectmq/src/omq/common/broker/Broker.java

@@ -23 +23 @@
 import com.rabbitmq.client.Connection;
 import com.rabbitmq.client.QueueingConsumer;
+import com.rabbitmq.client.QueueingConsumer.Delivery;
 import com.rabbitmq.client.ShutdownListener;
 import com.rabbitmq.client.ShutdownSignalException;
-import com.rabbitmq.client.QueueingConsumer.Delivery;
 
 public class Broker {
@@ -38 +38 @@
                         Environment.setEnvironment(env);
                         connection = OmqConnectionFactory.getNewConnection(env);
-                        connection.addShutdownListener(new ShutdownListener() {
-                                @Override
-                                public void shutdownCompleted(ShutdownSignalException cause) {
-                                        if (connection.isOpen()) {
-                                                try {
-                                                        connection.close();
-                                                } catch (IOException e) {
-                                                        e.printStackTrace();
-                                                }
-                                        }
-                                        try {
-                                                Properties env = Environment.getEnvironment();
-                                                connection = OmqConnectionFactory.getNewWorkingConnection(env);
-                                                channel = connection.createChannel();
-                                        } catch (Exception e) {
-                                                e.printStackTrace();
-                                        }
-                                }
-                        });
                         channel = connection.createChannel();
+                        addFaultTolerance();
                         try {
                                 tryConnection(env);
@@ -165 +147 @@
         }
 
+        private static void addFaultTolerance() {
+                connection.addShutdownListener(new ShutdownListener() {
+                        @Override
+                        public void shutdownCompleted(ShutdownSignalException cause) {
+
+                                if (cause.isHardError()) {
+                                        if (connection.isOpen()) {
+                                                try {
+                                                        connection.close();
+                                                } catch (IOException e) {
+                                                        e.printStackTrace();
+                                                }
+                                        }
+                                        try {
+                                                Properties env = Environment.getEnvironment();
+                                                connection = OmqConnectionFactory.getNewWorkingConnection(env);
+                                                channel = connection.createChannel();
+                                                addFaultTolerance();
+                                        } catch (Exception e) {
+                                                e.printStackTrace();
+                                        }
+                                } else {
+                                        Channel channel = (Channel) cause.getReference();
+                                        if (channel.isOpen()) {
+                                                try {
+                                                        channel.close();
+                                                } catch (IOException e) {
+                                                        e.printStackTrace();
+                                                }
+                                        }
+                                }
+                        }
+                });
+        }
+
 }

trunk/objectmq/src/omq/ztest/calculator/ClientTest.java

@@ -31 +31 @@
                 // Set info about where the message will be sent
                 env.setProperty(ParameterQueue.RPC_EXCHANGE, "rpc_exchange");
-                env.setProperty(ParameterQueue.DEBUGFILE, "c:\\middlewareDebug");
+                // env.setProperty(ParameterQueue.DEBUGFILE, "c:\\middlewareDebug");
 
                 // Set info about the queue & the exchange where the ResponseListener