Merge pull request #2 from GameCodePlus/incorrect-player-counts

Updated method to get players count to account for incorrect count in…

Author: chemdeath69

source/ark-metrics-exporter/ark-metrics-exporter.csproj

@@ -16,6 +16,7 @@
     <SignAssembly>true</SignAssembly>
     <DelaySign>false</DelaySign>
     <AssemblyOriginatorKeyFile>ark-metrics-exporter.snk</AssemblyOriginatorKeyFile>
+    <Version>1.0.1</Version>
   </PropertyGroup>
 
   <ItemGroup>

source/ark-metrics-exporter/models/ArkServer.cs

@@ -75,8 +75,19 @@ private void ProcessPlayerInfo()
                             PrometheusMgr.PlayerOnlineGague.RemoveLabelled(item);
                         }
                     }
+
+                    curLabels = PrometheusMgr.PlayerCountGague.GetAllLabelValues();
+                    if (curLabels != null)
+                    {
+                        foreach (var item in curLabels)
+                        {
+                            PrometheusMgr.PlayerCountGague.RemoveLabelled(item);
+                        }
+                    }
                 }
 
+                PrometheusMgr.PlayerCountGague.WithLabels(new string[] { configItem.IPAddress, configItem.Port.ToString(), $"{configItem.IPAddress}:{configItem.Port}", serverName }).Set(playerInfo.Players.Count);
+
                 foreach (var player in playerInfo.Players)
                 {
                     if (!String.IsNullOrWhiteSpace(player.PlayerName))
@@ -108,7 +119,10 @@ private void ProcessPlayerInfo()
                     }
                 }
             }
-            catch (Exception) { }
+            catch (Exception) 
+            {
+                PrometheusMgr.PlayerCountGague.WithLabels(new string[] { configItem.IPAddress, configItem.Port.ToString(), $"{configItem.IPAddress}:{configItem.Port}", serverName }).Set(0);
+            }
         }
 
         private void ProcessServerInfo()
@@ -132,28 +146,28 @@ private void ProcessServerInfo()
                         }
                     }
 
-                    curLabels = PrometheusMgr.PlayerCountGague.GetAllLabelValues();
-                    if (curLabels != null)
-                    {
-                        foreach (var item in curLabels)
-                        {
-                            PrometheusMgr.PlayerCountGague.RemoveLabelled(item);
-                        }
-                    }
+                    //curLabels = PrometheusMgr.PlayerCountGague.GetAllLabelValues();
+                    //if (curLabels != null)
+                    //{
+                    //    foreach (var item in curLabels)
+                    //    {
+                    //        PrometheusMgr.PlayerCountGague.RemoveLabelled(item);
+                    //    }
+                    //}
                 }
                 serverName = serverInfo.Name;
 
                 // Update the "IsUp" gague setting to "true"
                 PrometheusMgr.IsUpGague.WithLabels(new string[] { configItem.IPAddress, configItem.Port.ToString(), $"{configItem.IPAddress}:{configItem.Port}", serverName }).Set(1);
-                PrometheusMgr.PlayerCountGague.WithLabels(new string[] { configItem.IPAddress, configItem.Port.ToString(), $"{configItem.IPAddress}:{configItem.Port}", serverName }).Set(serverInfo.Players);
+                //PrometheusMgr.PlayerCountGague.WithLabels(new string[] { configItem.IPAddress, configItem.Port.ToString(), $"{configItem.IPAddress}:{configItem.Port}", serverName }).Set(serverInfo.Players);
             }
             catch (Exception)
             {
                 var curName = serverName ?? String.Empty;
 
                 // Update the "IsUp" gague setting to "false"
                 PrometheusMgr.IsUpGague.WithLabels(new string[] { configItem.IPAddress, configItem.Port.ToString(), $"{configItem.IPAddress}:{configItem.Port}", curName }).Set(0);
-                PrometheusMgr.PlayerCountGague.WithLabels(new string[] { configItem.IPAddress, configItem.Port.ToString(), $"{configItem.IPAddress}:{configItem.Port}", serverName }).Set(0);
+                //PrometheusMgr.PlayerCountGague.WithLabels(new string[] { configItem.IPAddress, configItem.Port.ToString(), $"{configItem.IPAddress}:{configItem.Port}", serverName }).Set(0);
             }
         }
     }