Changeset 103 for branches/supervisor/src/main/java/omq/supervisor/SupervisorImpl.java

Timestamp:

10/15/13 13:21:33 (11 years ago)

Author:

stoda

Message:

Supervisor done

TODO: revise supervisor

File:

• branches/supervisor/src/main/java/omq/supervisor/SupervisorImpl.java (modified) (4 diffs)

branches/supervisor/src/main/java/omq/supervisor/SupervisorImpl.java

@@ -10 +10 @@
 
 import org.apache.log4j.Logger;
-
-import com.rabbitmq.client.AMQP.Queue.DeclareOk;
-import com.rabbitmq.client.Channel;
 
 public class SupervisorImpl extends RemoteObject implements Supervisor {
@@ -41 +38 @@
 
         @Override
-        public void spawnObject(OmqSettings settings) throws Exception {
+        public void spawnObject(OmqSettings settings, int numObjects) throws Exception {
 
                 String reference = settings.getReference();
@@ -50 +47 @@
 
                 int minObjects = settings.getMinNumberObjects();
-
-                Channel channel = getBroker().getNewChannel();
-
-                int numObjects = 0;
-                try {
-                        DeclareOk dok = channel.queueDeclarePassive(reference);
-                        numObjects = dok.getConsumerCount();
-                        channel.close();
-                } catch (Exception io) {
-                        // The queue doesn't exist & the channel has been closed
-                }
 
                 for (RemoteBroker broker : brokers) {
@@ -75 +61 @@
 
         @Override
-        public void unbindObject(OmqSettings settings) throws Exception {
+        public void unbindObject(OmqSettings settings, int numObjects) throws Exception {
                 String reference = settings.getReference();
 
                 int minObjects = settings.getMinNumberObjects();
 
-                Channel channel = getBroker().getNewChannel();
+                for (RemoteBroker broker : brokers) {
+                        if (broker.hasObject(reference) && (numObjects - 1) >= minObjects) {
+                                broker.deleteObject(reference);
+                                break;
+                        }
+                }
 
-                int numObjects = 0;
-                try {
-                        DeclareOk dok = channel.queueDeclarePassive(reference);
-                        numObjects = dok.getConsumerCount();
-                        channel.close();
-
-                        for (RemoteBroker broker : brokers) {
-                                if (broker.hasObject(reference) && (numObjects - 1) >= minObjects) {
-                                        broker.deleteObject(reference);
-                                        break;
-                                }
-                        }
-
-                } catch (Exception io) {
-                        // The queue doesn't exist & the channel has been closed
-                }
         }