From ebaf36ebe5b6f409887d2352db44aba45bf7e086 Mon Sep 17 00:00:00 2001
From: Stephen Beaver <sbeaver@netgate.com>
Date: Fri, 15 Apr 2016 07:41:24 -0400
Subject: [PATCH] Fixed #6166

---
 src/usr/local/www/diag_system_activity.php | 48 ++++++++++++++--------
 1 file changed, 31 insertions(+), 17 deletions(-)

diff --git a/src/usr/local/www/diag_system_activity.php b/src/usr/local/www/diag_system_activity.php
index 2442b5f24e..8885855683 100644
--- a/src/usr/local/www/diag_system_activity.php
+++ b/src/usr/local/www/diag_system_activity.php
@@ -79,25 +79,39 @@ if ($input_errors) {
 ?>
 <script type="text/javascript">
 //<![CDATA[
-function getcpuactivity() {
-	$.ajax(
-		'/diag_system_activity.php',
-		{
-			method: 'post',
-			data: {
-				getactivity: 'yes'
-			},
-			dataType: "html",
-			success: function (data) {
-				$('#xhrOutput').html(data);
-			},
-		}
-	);
-}
-
 events.push(function() {
-	setInterval('getcpuactivity()', 2500);
+	ajaxbusy = false;
+
+	function getcpuactivity() {
+
+		if (ajaxbusy) {
+			return;
+		}
+
+		ajaxbusy = true;
+
+		ajaxRequest = $.ajax(
+			{
+				url: '/diag_system_activity.php',
+				type: 'post',
+				data: {
+					getactivity: 'yes'
+				},
+				dataType: "html",
+			}
+		);
+
+		// Deal with the results of the above ajax call
+		ajaxRequest.done(function (response, textStatus, jqXHR) {
+			$('#xhrOutput').html(response);
+			ajaxbusy = false;
+		});
+
+		setTimeout(getcpuactivity, 2500);
+	};
+
 	getcpuactivity();
+
 });
 //]]>
 </script>