Merge pull request #215 from tableau/dev

Fixing TabMon Config Loader
tableau · Feb 12, 2019 · 414bb2e · 414bb2e
2 parents b4bb298 + e957fdd
commit 414bb2e
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 22 deletions.
diff --git a/DataTableWriter/Drivers/PostgresDriver.cs b/DataTableWriter/Drivers/PostgresDriver.cs
@@ -3,7 +3,6 @@
 using System;
 using System.Collections.Generic;
 using System.Data;
-using System.Text;
 
 namespace DataTableWriter.Drivers
 {

diff --git a/DataTableWriter/Writers/IPurgeableDatasource.cs b/DataTableWriter/Writers/IPurgeableDatasource.cs
@@ -1,6 +1,4 @@
-using System.Data;
-
-namespace DataTableWriter.Writers
+namespace DataTableWriter.Writers
 {
     public interface IPurgeableDatasource
     {

diff --git a/TabMon/CounterConfig/MBeanCounterConfigReader.cs b/TabMon/CounterConfig/MBeanCounterConfigReader.cs
@@ -38,7 +38,7 @@ public ICollection<ICounter> LoadCounters(XmlNode root, Host host, CounterLifecy
             {
                 foreach (XmlNode sourceNode in sourceNodes)
                 {
-                    ICollection<IMBeanClient> mbeanClientPool;
+                    ICollection<IMBeanClient> mbeanClientPool = null;
                     if (!host.SpecifyPorts)
                     {
                         var startPort = Convert.ToInt32(sourceNode.Attributes["startport"].Value);
@@ -51,17 +51,27 @@ public ICollection<ICounter> LoadCounters(XmlNode root, Host host, CounterLifecy
                     else
                     {
                         var processName = sourceNode.Attributes["name"].Value;
-                        var ports = host.Processes[processName];
-
-                        // Retrieve a collection of all available clients within the specified port range, then new up counters using those.
-                        // This way, multiple counters can share a single client & connection.
-                        mbeanClientPool = MBeanClientFactory.CreateClients(host.Address, ports);
+                        if (host.Processes.ContainsKey(processName))
+                        {
+                            var ports = host.Processes[processName];
+
+                            // Retrieve a collection of all available clients within the specified port range, then new up counters using those.
+                            // This way, multiple counters can share a single client & connection.
+                            mbeanClientPool = MBeanClientFactory.CreateClients(host.Address, ports);
+                        }
+                        else
+                        {
+                            Log.DebugFormat("Process \"{0}\" is not contained in host section. Continuing..", processName);
+                        }
                     }
 
-                    foreach (var mbeanClient in mbeanClientPool)
+                    if (mbeanClientPool != null)
                     {
-                        var countersForSource = BuildCountersForSourceNode(sourceNode, host, mbeanClient);
-                        counters.AddRange(countersForSource);
+                        foreach (var mbeanClient in mbeanClientPool)
+                        {
+                            var countersForSource = BuildCountersForSourceNode(sourceNode, host, mbeanClient);
+                            counters.AddRange(countersForSource);
+                        }
                     }
                 }
             }

diff --git a/TabMon/Helpers/Process.cs b/TabMon/Helpers/Process.cs
@@ -1,5 +1,3 @@
-using System.Collections.Generic;
-
 namespace TabMon.Helpers
 {
     /// <summary>

diff --git a/TabMon/TabMonConfig/TabMonConfigReader.cs b/TabMon/TabMonConfig/TabMonConfigReader.cs
@@ -8,7 +8,6 @@
 using System.Configuration;
 using System.IO;
 using System.Reflection;
-using TabMon.Helpers;
 
 namespace TabMon.Config
 {

diff --git a/TabMonConfigBuilder/CommandLineOptions.cs b/TabMonConfigBuilder/CommandLineOptions.cs
@@ -1,7 +1,6 @@
 using CommandLine;
 using CommandLine.Text;
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Reflection;

diff --git a/TabMonConfigBuilder/Program.cs b/TabMonConfigBuilder/Program.cs
@@ -1,8 +1,5 @@
 using CommandLine;
 using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Reflection;
 
 namespace TabMonConfigBuilder
 {

diff --git a/TabMonConfigBuilder/TabMonConfigBuilder.cs b/TabMonConfigBuilder/TabMonConfigBuilder.cs
@@ -1,10 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
-using System.Threading.Tasks;
 using TabMonConfigBuilder.Helpers;
 
 namespace TabMonConfigBuilder