From 0f3ad9e28a3750ebd415dfb24a696b35c5ebf2c7 Mon Sep 17 00:00:00 2001
From: Keith Williams <keith.williams@ds2.com>
Date: Fri, 5 Mar 2021 10:54:47 -0600
Subject: [PATCH] Added some log guarding

---
 .../java/tak/server/plugins/McsSenderPlugin.java     | 12 ++++++++++--
 .../plugins/messagebroker/RabbitMQConsumer.java      |  5 ++++-
 .../server/plugins/processing/MessageConsumer.java   |  4 +++-
 .../tak.server.plugins.McsSenderPlugin.yaml          |  1 +
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/TAK Server Plugin/Plugin/src/takserver-sender-plugin-mcs/src/main/java/tak/server/plugins/McsSenderPlugin.java b/TAK Server Plugin/Plugin/src/takserver-sender-plugin-mcs/src/main/java/tak/server/plugins/McsSenderPlugin.java
index d501953..72b5df9 100644
--- a/TAK Server Plugin/Plugin/src/takserver-sender-plugin-mcs/src/main/java/tak/server/plugins/McsSenderPlugin.java	
+++ b/TAK Server Plugin/Plugin/src/takserver-sender-plugin-mcs/src/main/java/tak/server/plugins/McsSenderPlugin.java	
@@ -45,6 +45,8 @@ public class McsSenderPlugin extends MessageSenderBase implements MessageCallbac
 	private MessageConsumer _messageConsumer;
 	private BlockingQueue<String> _blockingQueue; 
     private ExecutorService _executor = Executors.newFixedThreadPool(2);
+
+	public static Boolean VerboseLogging = false;
 	
 	@SuppressWarnings("unchecked")
 	public McsSenderPlugin() {
@@ -65,6 +67,10 @@ public void start() {
 		try {
 			_logger.info("Configuration Properties: " + config.getProperties());
 
+			if (config.containsProperty("verboseLogging")) {
+				VerboseLogging = (boolean)config.getProperty("verboseLogging");
+			}
+
 			setupConnection();
 		} 
 		catch (Exception e) {
@@ -106,10 +112,12 @@ public void messageReceived(String message){
 				return;
 			}
 
-			_logger.info("TAK message converted: " + takMessage);
+			if(VerboseLogging)
+				_logger.info("TAK message converted: " + takMessage);
+			
 			send(takMessage);
 		} catch (Exception exception) {
-			_logger.error("error converting message", exception);
+			_logger.error("error converting message ", message, exception);
 		}
 	}
 }
diff --git a/TAK Server Plugin/Plugin/src/takserver-sender-plugin-mcs/src/main/java/tak/server/plugins/messagebroker/RabbitMQConsumer.java b/TAK Server Plugin/Plugin/src/takserver-sender-plugin-mcs/src/main/java/tak/server/plugins/messagebroker/RabbitMQConsumer.java
index 09f1431..04b0089 100644
--- a/TAK Server Plugin/Plugin/src/takserver-sender-plugin-mcs/src/main/java/tak/server/plugins/messagebroker/RabbitMQConsumer.java	
+++ b/TAK Server Plugin/Plugin/src/takserver-sender-plugin-mcs/src/main/java/tak/server/plugins/messagebroker/RabbitMQConsumer.java	
@@ -10,6 +10,7 @@
 
 import tak.server.plugins.processing.*;
 import tak.server.plugins.PluginConfiguration;
+import tak.server.plugins.McsSenderPlugin;
 
 public class RabbitMQConsumer {
     private MessageProducer _producer;
@@ -49,9 +50,11 @@ public void SetupConsumption(MessageProducer producer, PluginConfiguration confi
             String queueName = _channel.queueDeclare().getQueue();
             _channel.queueBind(queueName, _exchangeName, _routingKey);
 
+
             DeliverCallback deliverCallback = (consumerTag, delivery) -> {
                 String message = new String(delivery.getBody(), "UTF-8");
-                logger.info("Msg Received '" + delivery.getEnvelope().getRoutingKey() + "':'" + message + "'");
+                if (McsSenderPlugin.VerboseLogging)
+                    logger.info("Msg Received '" + delivery.getEnvelope().getRoutingKey() + "':'" + message + "'");
                 _producer.AddMessage(message);
             };
 
diff --git a/TAK Server Plugin/Plugin/src/takserver-sender-plugin-mcs/src/main/java/tak/server/plugins/processing/MessageConsumer.java b/TAK Server Plugin/Plugin/src/takserver-sender-plugin-mcs/src/main/java/tak/server/plugins/processing/MessageConsumer.java
index 36d82b7..9a2b000 100644
--- a/TAK Server Plugin/Plugin/src/takserver-sender-plugin-mcs/src/main/java/tak/server/plugins/processing/MessageConsumer.java	
+++ b/TAK Server Plugin/Plugin/src/takserver-sender-plugin-mcs/src/main/java/tak/server/plugins/processing/MessageConsumer.java	
@@ -8,6 +8,7 @@
 
 import java.util.concurrent.atomic.AtomicBoolean;
 
+import tak.server.plugins.McsSenderPlugin;
 import tak.server.plugins.interfaces.*;
 
 public class MessageConsumer {
@@ -34,7 +35,8 @@ public void Start(){
             try {
                 while(_running.get()) {
                     String message = _queue.take();
-                    _logger.info("message received in consumer sending to callback");
+                    if (McsSenderPlugin.VerboseLogging)
+                        _logger.info("message received in consumer sending to callback");
                     _callback.messageReceived(message);
                 }
             } 
diff --git a/TAK Server Plugin/Plugin/src/takserver-sender-plugin-mcs/tak.server.plugins.McsSenderPlugin.yaml b/TAK Server Plugin/Plugin/src/takserver-sender-plugin-mcs/tak.server.plugins.McsSenderPlugin.yaml
index 256afe7..5551c7d 100644
--- a/TAK Server Plugin/Plugin/src/takserver-sender-plugin-mcs/tak.server.plugins.McsSenderPlugin.yaml	
+++ b/TAK Server Plugin/Plugin/src/takserver-sender-plugin-mcs/tak.server.plugins.McsSenderPlugin.yaml	
@@ -1,5 +1,6 @@
 processing_queue_size: 10
 useRapidX : true
+verboseLogging : false
 rabbitmq:
   exchange_name: "dragonfly"
   routing_key: "dragonfly.demo_entities"