Merge pull request #58 from Cinimex-Informatica/bugfix/issue57_sendpcfommands_flag_error

issue57 Fixes #57 bug with wrong sendPCFCommands flag processing

Author: echerniak

.gitignore

@@ -1,4 +1,5 @@
 .metadata/
+log/
 *.class
 **/target/
 *.jar

src/main/java/ru/cinimex/exporter/ExporterLauncher.java

@@ -42,29 +42,25 @@ public static void main(String[] args) {
         ArrayList<MQObject.MQType> monitoringTypes = new ArrayList<>();
         ArrayList<MQObject> objects = new ArrayList<>();
 
-        if (config.sendPCFCommands()) {
-            if (config.getQueues() != null && config.getQueues().size() > 0) {
-                monitoringTypes.add(MQObject.MQType.QUEUE);
-                for (String queueName : config.getQueues()) {
-                    objects.add(new MQObject(queueName, MQObject.MQType.QUEUE));
-                    logger.debug("Queue {} was added for additional monitoring.", queueName);
-                }
+        if (config.getQueues() != null && config.getQueues().size() > 0) {
+            monitoringTypes.add(MQObject.MQType.QUEUE);
+            for (String queueName : config.getQueues()) {
+                objects.add(new MQObject(queueName, MQObject.MQType.QUEUE));
             }
-            if (config.getChannels() != null && config.getChannels().size() > 0) {
-                monitoringTypes.add(MQObject.MQType.CHANNEL);
-                for (String channelName : config.getChannels()) {
-                    objects.add(new MQObject(channelName, MQObject.MQType.CHANNEL));
-                    logger.debug("Channel {} was added for additional monitoring.", channelName);
-                }
+        }
+        if (config.getChannels() != null && config.getChannels().size() > 0) {
+            monitoringTypes.add(MQObject.MQType.CHANNEL);
+            for (String channelName : config.getChannels()) {
+                objects.add(new MQObject(channelName, MQObject.MQType.CHANNEL));
             }
-            if (config.getListeners() != null && config.getListeners().size() > 0) {
-                monitoringTypes.add(MQObject.MQType.LISTENER);
-                for (String listenerName : config.getListeners()) {
-                    objects.add(new MQObject(listenerName, MQObject.MQType.LISTENER));
-                    logger.debug("Listener {} was added for additional monitoring.", listenerName);
-                }
+        }
+        if (config.getListeners() != null && config.getListeners().size() > 0) {
+            monitoringTypes.add(MQObject.MQType.LISTENER);
+            for (String listenerName : config.getListeners()) {
+                objects.add(new MQObject(listenerName, MQObject.MQType.LISTENER));
             }
         }
+
         MetricsManager.initMetrics(elements, monitoringTypes);
         MQSubscriberManager manager = new MQSubscriberManager(config.getQmgrHost(), config.getQmgrPort(), config.getQmgrChannel(), config.getQmgrName(), config.getUser(), config.getPassword(), config.useMqscp());
         manager.runSubscribers(elements, objects, config.sendPCFCommands(), config.usePCFWildcards(), config.getScrapeInterval());

src/main/java/ru/cinimex/exporter/mq/MQSubscriberManager.java

@@ -90,12 +90,15 @@ public void runSubscribers(ArrayList<PCFElement> elements, ArrayList<MQObject> o
                     switch (object.getType()) {
                         case QUEUE:
                             queues.add(object);
+                            logger.debug("Queue {} was added for additional monitoring.", object.getName());
                             break;
                         case CHANNEL:
                             channels.add(object);
+                            logger.debug("Channel {} was added for additional monitoring.", object.getName());
                             break;
                         case LISTENER:
                             listeners.add(object);
+                            logger.debug("Listener {} was added for additional monitoring.", object.getName());
                             break;
                         default:
                             logger.error("Error during parsing objects list: Unknown object type! Make sure it is one of: {}", MQObject.MQType.values());