Merge branch 'hotfix/updateChannelSubscribe'

brandonscott · May 9, 2014 · dd107cc · dd107cc
2 parents 22205c0 + de81f83
commit dd107cc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/CadenceHost/Helpers/Statistics.cs b/CadenceHost/Helpers/Statistics.cs
@@ -62,7 +62,7 @@ public Statistics()
         /// <returns>The current CPU usage</returns>
         public string GetCurrentCpu()
         {
-            return _cpuCounter.NextValue().ToString(CultureInfo.InvariantCulture);
+            return Convert.ToInt32(_cpuCounter.NextValue()).ToString(CultureInfo.InvariantCulture);
         }
 
         /// <summary>

diff --git a/CadenceHost/Windows/MainWindow.xaml.cs b/CadenceHost/Windows/MainWindow.xaml.cs
@@ -92,17 +92,19 @@ public MainWindow()
 
         private void OnPulse(object sender, EventArgs e)
         {
+            var currentCpu = _statsHelper.GetCurrentCpu();
+
             AddDebugInfo(
                 String.Format("Sending Pulse to server with CPU: {0}, RAM: {1}, Disk Usage: {2} and Uptime: {3} with a Total RAM Size of: {4}",
-                    _statsHelper.GetCurrentCpu(), _statsHelper.GetCurrentRam(), "%DISK%", "%UPTIME%", _statsHelper.GetTotalRamSize()));
+                    currentCpu, _statsHelper.GetCurrentRam(), "%DISK%", "%UPTIME%", _statsHelper.GetTotalRamSize()));
 
             var timeSpan = (DateTime.UtcNow - new DateTime(1970, 1, 1, 0, 0, 0));
 
             var dataToSend = new NameValueCollection
             {
                 {"server_id", _serverID.ToString()},
                 {"ram_usage", _statsHelper.GetCurrentRamPercent()},
-                {"cpu_usage", _statsHelper.GetCurrentCpu()},
+                {"cpu_usage", currentCpu},
                 {"disk_usage", "0"},
                 {"uptime", "0"},
                 {"timestamp", timeSpan.TotalSeconds.ToString(CultureInfo.InvariantCulture)}