Changeset 111 for branches/supervisor/src

Timestamp:

11/11/13 12:11:51 (11 years ago)

Author:

stoda

Message:

Broker:

tryconnection won't be used
DOMConfigurator won't be used

Location:

branches/supervisor/src/main

Files:

• java/omq/client/proxy/Proxymq.java (modified) (3 diffs)
• java/omq/common/broker/Broker.java (modified) (7 diffs)
• resources/log4j.xml (modified) (2 diffs)

branches/supervisor/src/main/java/omq/client/proxy/Proxymq.java

@@ -268 +268 @@
 
                 // Wait for the results.
-                long localTimeout = timeout;
+                long localTimeout = 0;
                 long start = System.currentTimeMillis();
                 synchronized (results) {
@@ -320 +320 @@
 
                 int i = 0;
-                long localTimeout = timeout;
+                long localTimeout = 0;
                 long start = System.currentTimeMillis();
 
@@ -380 +380 @@
 
         @Override
-        public void setUID(String uID) {System.out.println("SET UID");
+        public void setUID(String uID) {
                 this.UID = uID;
         }

branches/supervisor/src/main/java/omq/common/broker/Broker.java

@@ -3 +3 @@
 import java.io.IOException;
 import java.lang.reflect.Proxy;
-import java.net.URL;
 import java.util.HashMap;
 import java.util.Hashtable;
@@ -23 +22 @@
 
 import org.apache.log4j.Logger;
-import org.apache.log4j.xml.DOMConfigurator;
-
+
+import com.rabbitmq.client.AMQP.BasicProperties;
 import com.rabbitmq.client.Channel;
 import com.rabbitmq.client.Connection;
 import com.rabbitmq.client.QueueingConsumer;
-import com.rabbitmq.client.AMQP.BasicProperties;
 import com.rabbitmq.client.QueueingConsumer.Delivery;
 import com.rabbitmq.client.ShutdownListener;
@@ -60 +58 @@
         public Broker(Properties env) throws Exception {
                 // Load log4j configuration
-                URL log4jResource = Broker.class.getResource("/log4j.xml");
-                DOMConfigurator.configure(log4jResource);
+                // URL log4jResource = Broker.class.getResource("/log4j.xml");
+                // DOMConfigurator.configure(log4jResource);
 
                 remoteObjs = new HashMap<String, RemoteObject>();
@@ -69 +67 @@
                 channel = connection.createChannel();
                 addFaultTolerance();
-                try {
-                        tryConnection(env);
-                } catch (Exception e) {
-                        channel.close();
-                        connection.close();
+                if (!connection.isOpen() || !channel.isOpen()) {
+                        if (connection.isOpen()) {
+                                connection.close();
+                        }
                         throw new InitBrokerException("The connection didn't work");
                 }
+
+                // try {
+                // tryConnection(env);
+                // } catch (Exception e) {
+                // channel.close();
+                // connection.close();
+                // throw new InitBrokerException("The connection didn't work");
+                // }
         }
 
@@ -99 +104 @@
 
                 clientStarted = false;
-                connectionClosed = false;
+                // connectionClosed = false;
                 environment = null;
                 remoteObjs = null;
@@ -121 +126 @@
                 connectionClosed = true;
                 connection.close();
-                connectionClosed = false;
+                // connectionClosed = false;
         }
 
@@ -154 +159 @@
          * @throws IOException
          */
-        public synchronized void publishMessge(String exchange, String routingKey, BasicProperties props, byte[] bytesRequest) throws IOException {
+        public synchronized void publishMessge(String exchange, String routingKey, BasicProperties props, byte[] bytesRequest)
+                        throws IOException {
                 if (!channel.isOpen()) {
                         logger.error("Broker's channel is closed opening a new one", channel.getCloseReason());

branches/supervisor/src/main/resources/log4j.xml

@@ -4 +4 @@
 <log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
     <appender name="consoleAppender" class="org.apache.log4j.ConsoleAppender">
-        <param name="Threshold" value="INFO" />
+        <param name="Threshold" value="OFF" />
         <layout class="org.apache.log4j.PatternLayout">
             <param name="ConversionPattern" value="%d{[yyyy-MM-dd HH:mm:ss]} %-5p %c:%L - %m%n" />
@@ -30 +30 @@
 
   <root> 
-    <priority value ="INFO" /> 
+    <priority value ="OFF" /> 
     <appender-ref ref="consoleAppender" />
     <appender-ref ref="A2" />