Fix changing spans
Showing
2 changed files
with
12 additions
and
6 deletions
... | @@ -216,6 +216,8 @@ | ... | @@ -216,6 +216,8 @@ |
216 | for (var i = 0; i < otherSpans.length; i++) { | 216 | for (var i = 0; i < otherSpans.length; i++) { |
217 | if (otherSpans[i] !== e.target) otherSpans[i].classList.remove('active'); | 217 | if (otherSpans[i] !== e.target) otherSpans[i].classList.remove('active'); |
218 | } | 218 | } |
219 | |||
220 | socket.emit('change'); | ||
219 | }; | 221 | }; |
220 | 222 | ||
221 | socket.on('start', function (data) { | 223 | socket.on('start', function (data) { |
... | @@ -225,25 +227,25 @@ | ... | @@ -225,25 +227,25 @@ |
225 | data[defaultSpan].os.pop(); | 227 | data[defaultSpan].os.pop(); |
226 | 228 | ||
227 | cpuStat.textContent = data[defaultSpan].os[data[defaultSpan].os.length - 1].cpu.toFixed(1) + '%'; | 229 | cpuStat.textContent = data[defaultSpan].os[data[defaultSpan].os.length - 1].cpu.toFixed(1) + '%'; |
228 | cpuChart.data.datasets[defaultSpan].data = data[defaultSpan].os.map(function (point) { | 230 | cpuChart.data.datasets[0].data = data[defaultSpan].os.map(function (point) { |
229 | return point.cpu; | 231 | return point.cpu; |
230 | }); | 232 | }); |
231 | cpuChart.data.labels = data[defaultSpan].os.map(addTimestamp); | 233 | cpuChart.data.labels = data[defaultSpan].os.map(addTimestamp); |
232 | 234 | ||
233 | memStat.textContent = data[defaultSpan].os[data[defaultSpan].os.length - 1].memory.toFixed(1) + 'MB'; | 235 | memStat.textContent = data[defaultSpan].os[data[defaultSpan].os.length - 1].memory.toFixed(1) + 'MB'; |
234 | memChart.data.datasets[defaultSpan].data = data[defaultSpan].os.map(function (point) { | 236 | memChart.data.datasets[0].data = data[defaultSpan].os.map(function (point) { |
235 | return point.memory; | 237 | return point.memory; |
236 | }); | 238 | }); |
237 | memChart.data.labels = data[defaultSpan].os.map(addTimestamp); | 239 | memChart.data.labels = data[defaultSpan].os.map(addTimestamp); |
238 | 240 | ||
239 | loadStat.textContent = data[defaultSpan].os[data[defaultSpan].os.length - 1].load[defaultSpan].toFixed(2); | 241 | loadStat.textContent = data[defaultSpan].os[data[defaultSpan].os.length - 1].load[defaultSpan].toFixed(2); |
240 | loadChart.data.datasets[defaultSpan].data = data[defaultSpan].os.map(function (point) { | 242 | loadChart.data.datasets[0].data = data[defaultSpan].os.map(function (point) { |
241 | return point.load[defaultSpan]; | 243 | return point.load[0]; |
242 | }); | 244 | }); |
243 | loadChart.data.labels = data[defaultSpan].os.map(addTimestamp); | 245 | loadChart.data.labels = data[defaultSpan].os.map(addTimestamp); |
244 | 246 | ||
245 | responseTimeStat.textContent = data[defaultSpan].responses[data[defaultSpan].responses.length - 1].mean.toFixed(2) + 'ms'; | 247 | responseTimeStat.textContent = data[defaultSpan].responses[data[defaultSpan].responses.length - 1].mean.toFixed(2) + 'ms'; |
246 | responseTimeChart.data.datasets[defaultSpan].data = data[defaultSpan].responses.map(function (point) { | 248 | responseTimeChart.data.datasets[0].data = data[defaultSpan].responses.map(function (point) { |
247 | return point.mean; | 249 | return point.mean; |
248 | }); | 250 | }); |
249 | responseTimeChart.data.labels = data[defaultSpan].responses.map(addTimestamp); | 251 | responseTimeChart.data.labels = data[defaultSpan].responses.map(addTimestamp); |
... | @@ -251,7 +253,7 @@ | ... | @@ -251,7 +253,7 @@ |
251 | if (data[defaultSpan].responses.length >= 2) { | 253 | if (data[defaultSpan].responses.length >= 2) { |
252 | var deltaTime = data[defaultSpan].responses[data[defaultSpan].responses.length - 1].timestamp - data[defaultSpan].responses[data[defaultSpan].responses.length - 2].timestamp; | 254 | var deltaTime = data[defaultSpan].responses[data[defaultSpan].responses.length - 1].timestamp - data[defaultSpan].responses[data[defaultSpan].responses.length - 2].timestamp; |
253 | rpsStat.textContent = (data[defaultSpan].responses[data[defaultSpan].responses.length - 1].count / deltaTime * 1000).toFixed(2); | 255 | rpsStat.textContent = (data[defaultSpan].responses[data[defaultSpan].responses.length - 1].count / deltaTime * 1000).toFixed(2); |
254 | rpsChart.data.datasets[defaultSpan].data = data[defaultSpan].responses.map(function (point) { | 256 | rpsChart.data.datasets[0].data = data[defaultSpan].responses.map(function (point) { |
255 | return point.count / deltaTime * 1000; | 257 | return point.count / deltaTime * 1000; |
256 | }); | 258 | }); |
257 | rpsChart.data.labels = data[defaultSpan].responses.map(addTimestamp); | 259 | rpsChart.data.labels = data[defaultSpan].responses.map(addTimestamp); |
... | @@ -262,6 +264,7 @@ | ... | @@ -262,6 +264,7 @@ |
262 | }); | 264 | }); |
263 | 265 | ||
264 | var spanControls = document.getElementById('span-controls'); | 266 | var spanControls = document.getElementById('span-controls'); |
267 | if (data.length !== spans.length) { | ||
265 | data.forEach(function (span, index) { | 268 | data.forEach(function (span, index) { |
266 | spans.push({ | 269 | spans.push({ |
267 | retention: span.retention, | 270 | retention: span.retention, |
... | @@ -275,6 +278,7 @@ | ... | @@ -275,6 +278,7 @@ |
275 | spanNode.onclick = onSpanChange; | 278 | spanNode.onclick = onSpanChange; |
276 | spanControls.appendChild(spanNode); | 279 | spanControls.appendChild(spanNode); |
277 | }); | 280 | }); |
281 | } | ||
278 | }); | 282 | }); |
279 | 283 | ||
280 | socket.on('stats', function (data) { | 284 | socket.on('stats', function (data) { | ... | ... |
... | @@ -83,6 +83,8 @@ | ... | @@ -83,6 +83,8 @@ |
83 | 83 | ||
84 | io.on('connection', (socket) => { | 84 | io.on('connection', (socket) => { |
85 | socket.emit('start', config.spans); | 85 | socket.emit('start', config.spans); |
86 | |||
87 | socket.on('change', function() { socket.emit('start', config.spans); }); | ||
86 | }); | 88 | }); |
87 | 89 | ||
88 | config.spans.forEach((span) => { | 90 | config.spans.forEach((span) => { | ... | ... |
-
Please register or sign in to post a comment