Changeset 49 for trunk/src/main/java/omq/common

Timestamp:

06/19/13 15:59:53 (11 years ago)

Author:

stoda

Message:

log4j added

Location:

trunk/src/main/java/omq/common

Files:

• broker/Broker.java (modified) (7 diffs)
• event/EventDispatcher.java (modified) (7 diffs)
• util/OmqConnectionFactory.java (modified) (4 diffs)
• util/Serializer.java (modified) (3 diffs)
• util/Serializers/GsonImp.java (modified) (1 diff)

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

@@ -2 +2 @@
 
 import java.io.IOException;
+import java.net.URL;
 import java.util.HashMap;
 import java.util.Map;
@@ -20 +21 @@
 import omq.server.RemoteObject;
 
+import org.apache.log4j.Logger;
+import org.apache.log4j.xml.DOMConfigurator;
+
 import com.rabbitmq.client.Channel;
 import com.rabbitmq.client.Connection;
@@ -28 +32 @@
 
 public class Broker {
+
+        private static final Logger logger = Logger.getLogger(Broker.class.getName());
+
         private static Connection connection;
         private static Channel channel;
@@ -45 +52 @@
         public static synchronized void initBroker(Properties env) throws Exception {
                 if (environment == null) {
+
+                        // Load log4j configuration
+                        URL log4jResource = Broker.class.getResource("/log4j.xml");
+                        DOMConfigurator.configure(log4jResource);
+
                         remoteObjs = new HashMap<String, RemoteObject>();
                         environment = env;
@@ -58 +70 @@
                         }
                 } else {
-                        throw new InitBrokerException("Broker already started");
+                        logger.error("Broker is already started");
+                        throw new InitBrokerException("Broker is already started");
                 }
         }
 
         public static void stopBroker() throws Exception {
+                logger.warn("Stopping broker");
                 // Stop the client
                 if (clientStarted) {
@@ -93 +107 @@
 
         public static void closeConnection() throws IOException {
+                logger.warn("Clossing connection");
                 connectionClosed = true;
                 connection.close();
@@ -241 +256 @@
                         @Override
                         public void shutdownCompleted(ShutdownSignalException cause) {
+                                logger.warn("Shutdown message received. Cause: " + cause.getMessage());
                                 if (!connectionClosed)
                                         if (cause.isHardError()) {

trunk/src/main/java/omq/common/event/EventDispatcher.java

@@ -9 +9 @@
 import omq.common.util.ParameterQueue;
 import omq.common.util.Serializer;
+
+import org.apache.log4j.Logger;
 
 import com.rabbitmq.client.Channel;
@@ -26 +28 @@
 @SuppressWarnings("rawtypes")
 public class EventDispatcher extends Thread {
+        private static final Logger logger = Logger.getLogger(EventDispatcher.class.getName());
         private static EventDispatcher dispatcher;
 
@@ -67 +70 @@
 
         public static void stopEventDispatcher() throws Exception {
+                logger.warn("Stopping EventDispatcher");
                 dispatcher.setListeners(null);
                 dispatcher.killed = true;
@@ -102 +106 @@
                                 event = Serializer.deserializeEvent(delivery.getBody());
 
-                                System.out.println("Event received -> Topic: " + event.getTopic() + "CorrId: " + event.getCorrId());
+                                logger.info("Event received -> Topic: " + event.getTopic() + "CorrId: " + event.getCorrId());
                                 // Log.saveLog("Client-Deserialize", delivery.getBody());
 
@@ -112 +116 @@
                                 dispatch(event.getTopic(), event);
                         } catch (InterruptedException i) {
-                                System.out.println("InterruptedException e: " + i);
-                                i.printStackTrace();
+                                logger.error(i);
                         } catch (ShutdownSignalException e) {
-                                System.out.println("ShutdownSignalException e: " + e);
-                                e.printStackTrace();
+                                logger.error(e);
                                 try {
                                         if (channel.isOpen()) {
@@ -127 +129 @@
                                                 Thread.sleep(milis);
                                         } catch (InterruptedException e2) {
-                                                e2.printStackTrace();
+                                                logger.error(e2);
                                         }
-                                        e1.printStackTrace();
+                                        logger.error(e1);
                                 }
                         } catch (ConsumerCancelledException e) {
-                                System.out.println("ConsumerCancelledException e: " + e);
-                                e.printStackTrace();
+                                logger.error(e);
                         } catch (Exception e) {
-                                System.out.println("Exception e: " + e);
-                                e.printStackTrace();
+                                logger.error(e);
                         }
                 }
@@ -160 +160 @@
                         String reference = e.getTopic();
 
-                        System.out.println("EventDispatcher declaring fanout -> " + reference + " Binding with: " + queueName);
+                        logger.info("Declaring fanout -> " + reference + " Binding with: " + queueName);
 
                         channel.exchangeDeclare(reference, "fanout");

trunk/src/main/java/omq/common/util/OmqConnectionFactory.java

@@ -5 +5 @@
 import java.security.NoSuchAlgorithmException;
 import java.util.Properties;
+
+import org.apache.log4j.Logger;
 
 import com.rabbitmq.client.Channel;
@@ -16 +18 @@
  */
 public class OmqConnectionFactory {
+        private static final Logger logger = Logger.getLogger(OmqConnectionFactory.class.getName());
+
         private static Connection connection;
         private static int connectionTimeout = 2 * 1000;
@@ -34 +38 @@
                                 working = true;
                         } catch (Exception e) {
-                                e.printStackTrace();
+                                logger.error(e);
                                 long milis = Long.parseLong(env.getProperty(ParameterQueue.RETRY_TIME_CONNECTION, "2000"));
                                 Thread.sleep(milis);
@@ -64 +68 @@
                         factory.useSslProtocol();
                 }
-                return factory.newConnection();
+
+                Connection connection = factory.newConnection();
+                logger.info("New connection created using: username: " + username + ", host: " + host + ", port: " + port + ", connection timeout: "
+                                + connectionTimeout + " SSL enabled: " + ssl);
+                return connection;
         }
 
         public static Channel getNewChannel() throws IOException {
-                return connection.createChannel();
+                Channel channel = connection.createChannel();
+                logger.info("New channel created using the default connection");
+                return channel;
         }
 }

trunk/src/main/java/omq/common/util/Serializer.java

@@ -3 +3 @@
 import java.io.IOException;
 import java.util.Properties;
+
+import org.apache.log4j.Logger;
 
 import omq.common.broker.Broker;
@@ -21 +23 @@
  */
 public class Serializer {
+        private static final Logger logger = Logger.getLogger(Serializer.class.getName());
         public static String kryo = "kryo";
         public static String java = "java";
@@ -158 +161 @@
 
         public static void removeSerializers() {
+                logger.warn("Removing serializers");
                 serializer = null;
                 kryoSerializer = null;

trunk/src/main/java/omq/common/util/Serializers/GsonImp.java

@@ -22 +22 @@
         public byte[] serialize(Object obj) throws SerializerException {
                 String json = gson.toJson(obj);
-                System.out.println(json);
                 return json.getBytes();
         }