diff --git a/TAK Server Plugin/Plugin/src/takserver-sender-plugin-mcs/src/main/java/tak/server/plugins/McsLoggerReceiverPlugin.java b/TAK Server Plugin/Plugin/src/takserver-sender-plugin-mcs/src/main/java/tak/server/plugins/McsLoggerReceiverPlugin.java index 0068789..da00dd7 100644 --- a/TAK Server Plugin/Plugin/src/takserver-sender-plugin-mcs/src/main/java/tak/server/plugins/McsLoggerReceiverPlugin.java +++ b/TAK Server Plugin/Plugin/src/takserver-sender-plugin-mcs/src/main/java/tak/server/plugins/McsLoggerReceiverPlugin.java @@ -8,20 +8,27 @@ @TakServerPlugin(name = "MCS COP Receiver Plugin", description = "TAK Server plugin that consumes TAK CoT messages, converts them to MCS COP messages, and sends them to the MCS COP Message Broker") public class McsLoggerReceiverPlugin extends MessageReceiverBase { - private static final Logger logger = LoggerFactory.getLogger(McsLoggerReceiverPlugin.class); + private static final Logger _logger = LoggerFactory.getLogger(McsLoggerReceiverPlugin.class); + + private Boolean _verboseLogging = false; public McsLoggerReceiverPlugin() throws ReservedConfigurationException { - logger.info("create " + getClass().getName()); + _logger.info("create " + getClass().getName()); + if (config.containsProperty("verboseLogging")){ + _verboseLogging = (boolean)config.getProperty("verboseLogging"); + } + + _logger.info("logging = " + _verboseLogging.toString()); } @Override public void start() { - logger.info(getClass().getName() + " started"); + _logger.info(getClass().getName() + " started"); } @Override public void onMessage(Message message) { - - logger.info("plugin message received: " + message); + if (_verboseLogging) + _logger.info("plugin message received: " + message); } } \ No newline at end of file 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 72b5df9..69346e8 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 @@ -55,6 +55,9 @@ public McsSenderPlugin() { if (config.containsProperty("processing_queue_size")) _queueSize = (int)config.getProperty("processing_queue_size"); + if (config.containsProperty("verboseLogging")) + VerboseLogging = (boolean)config.getProperty("verboseLogging"); + _blockingQueue = new LinkedBlockingDeque<>(_queueSize); _rabbitMqConsumer = new RabbitMQConsumer(); @@ -67,10 +70,6 @@ public void start() { try { _logger.info("Configuration Properties: " + config.getProperties()); - if (config.containsProperty("verboseLogging")) { - VerboseLogging = (boolean)config.getProperty("verboseLogging"); - } - setupConnection(); } catch (Exception e) { diff --git a/TAK Server Plugin/Plugin/src/takserver-sender-plugin-mcs/tak.server.plugins.McsLoggerReceiverPlugin.yaml b/TAK Server Plugin/Plugin/src/takserver-sender-plugin-mcs/tak.server.plugins.McsLoggerReceiverPlugin.yaml new file mode 100644 index 0000000..8600a91 --- /dev/null +++ b/TAK Server Plugin/Plugin/src/takserver-sender-plugin-mcs/tak.server.plugins.McsLoggerReceiverPlugin.yaml @@ -0,0 +1,2 @@ +verboseLogging : false + diff --git a/TAK Server Plugin/RabbitMQ Client/Program.cs b/TAK Server Plugin/RabbitMQ Client/Program.cs index 160bc25..316d50b 100644 --- a/TAK Server Plugin/RabbitMQ Client/Program.cs +++ b/TAK Server Plugin/RabbitMQ Client/Program.cs @@ -10,7 +10,7 @@ namespace RabbitMQClient class Program { private static string EXCHANGE = "dragonfly"; - private static string ROUTING_KEY = "dragonfly.entity_locations"; + private static string ROUTING_KEY = "dragonfly.demo_entities"; private static string RABBITMQ_HOSTNAME = "gsa.cognitics.net"; private static string PASSWORD = "dragonfly"; private static string USERNAME = "rapidx";