e63a64ef by Rafal Wilinski

:alarm_clock:Fix data shifting

1 parent d5fef62c
...@@ -231,7 +231,6 @@ ...@@ -231,7 +231,6 @@
231 socket.on('start', function(data) { 231 socket.on('start', function(data) {
232 // Remove last element of Array because it contains malformed responses data. 232 // Remove last element of Array because it contains malformed responses data.
233 // To keep consistency we also remove os data. 233 // To keep consistency we also remove os data.
234 console.log(data);
235 data[0].responses.pop(); 234 data[0].responses.pop();
236 data[0].os.pop(); 235 data[0].os.pop();
237 236
...@@ -265,34 +264,40 @@ ...@@ -265,34 +264,40 @@
265 }); 264 });
266 265
267 socket.on('stats', function (data) { 266 socket.on('stats', function (data) {
268 // Remove last element of Array because it contains malformed responses data.
269 // To keep consistency we also remove os data.
270 console.log(data);
271
272 cpuStat.textContent = data.os.cpu.toFixed(1) + '%'; 267 cpuStat.textContent = data.os.cpu.toFixed(1) + '%';
273 cpuChart.data.datasets[0].data.push(data.os.cpu); 268 cpuChart.data.datasets[0].data.push(data.os.cpu);
274 cpuChart.data.labels.push(data.os.timestamp); 269 cpuChart.data.labels.push(data.os.timestamp);
270 cpuChart.data.datasets[0].data.shift();
271 cpuChart.data.labels.shift();
275 cpuChart.update(); 272 cpuChart.update();
276 273
277 memStat.textContent = data.os.memory.toFixed(1) + 'MB'; 274 memStat.textContent = data.os.memory.toFixed(1) + 'MB';
278 memChart.data.datasets[0].data.push(data.os.memory); 275 memChart.data.datasets[0].data.push(data.os.memory);
279 memChart.data.labels.push(data.os.timestamp); 276 memChart.data.labels.push(data.os.timestamp);
277 memChart.data.datasets[0].data.shift();
278 memChart.data.labels.shift();
280 memChart.update(); 279 memChart.update();
281 280
282 loadStat.textContent = data.os.load[0].toFixed(2); 281 loadStat.textContent = data.os.load[0].toFixed(2);
283 loadChart.data.datasets[0].data.push(data.os.load[0]); 282 loadChart.data.datasets[0].data.push(data.os.load[0]);
284 loadChart.data.labels.push(data.os.timestamp); 283 loadChart.data.labels.push(data.os.timestamp);
284 loadChart.data.datasets[0].data.shift();
285 loadChart.data.labels.shift();
285 loadChart.update(); 286 loadChart.update();
286 287
287 responseTimeStat.textContent = data.responses.mean.toFixed(2) + 'ms'; 288 responseTimeStat.textContent = data.responses.mean.toFixed(2) + 'ms';
288 responseTimeChart.data.datasets[0].data.push(data.responses.mean); 289 responseTimeChart.data.datasets[0].data.push(data.responses.mean);
289 responseTimeChart.data.labels.push(data.responses.timestamp); 290 responseTimeChart.data.labels.push(data.responses.timestamp);
291 responseTimeChart.data.datasets[0].data.shift();
292 responseTimeChart.data.labels.shift();
290 responseTimeChart.update(); 293 responseTimeChart.update();
291 294
292 var deltaTime = data.responses.timestamp - rpsChart.data.labels[rpsChart.data.labels.length - 1]; 295 var deltaTime = data.responses.timestamp - rpsChart.data.labels[rpsChart.data.labels.length - 1];
293 rpsStat.textContent = (data.responses.count / deltaTime * 1000).toFixed(2); 296 rpsStat.textContent = (data.responses.count / deltaTime * 1000).toFixed(2);
294 rpsChart.data.datasets[0].data.push(data.responses.count / deltaTime * 1000); 297 rpsChart.data.datasets[0].data.push(data.responses.count / deltaTime * 1000);
295 rpsChart.data.labels.push(data.responses.timestamp); 298 rpsChart.data.labels.push(data.responses.timestamp);
299 rpsChart.data.datasets[0].data.shift();
300 rpsChart.data.labels.shift();
296 rpsChart.update(); 301 rpsChart.update();
297 }); 302 });
298 </script> 303 </script>
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!