Merge pull request #2199 from syuilo/patch-2176

Resolve #2176
This commit is contained in:
syuilo 2018-08-14 07:51:45 +09:00 committed by GitHub
commit 0702d0974b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 41 additions and 6 deletions

View file

@ -1,21 +1,22 @@
import * as childProcess from 'child_process'; import * as childProcess from 'child_process';
import Xev from 'xev'; import Xev from 'xev';
import Queue from '../misc/queue';
const ev = new Xev(); const ev = new Xev();
export default function() { export default function() {
const log: any[] = []; const log = new Queue<any>();
const p = childProcess.fork(__dirname + '/notes-stats-child.js'); const p = childProcess.fork(__dirname + '/notes-stats-child.js');
p.on('message', stats => { p.on('message', stats => {
ev.emit('notesStats', stats); ev.emit('notesStats', stats);
log.push(stats); log.push(stats);
if (log.length > 100) log.shift(); if (log.length > 100) log.pop();
}); });
ev.on('requestNotesStatsLog', id => { ev.on('requestNotesStatsLog', id => {
ev.emit('notesStatsLog:' + id, log); ev.emit('notesStatsLog:' + id, log.toArray());
}); });
process.on('exit', code => { process.on('exit', code => {

View file

@ -2,6 +2,7 @@ import * as os from 'os';
import * as sysUtils from 'systeminformation'; import * as sysUtils from 'systeminformation';
import * as diskusage from 'diskusage'; import * as diskusage from 'diskusage';
import Xev from 'xev'; import Xev from 'xev';
import Queue from '../misc/queue';
const osUtils = require('os-utils'); const osUtils = require('os-utils');
const ev = new Xev(); const ev = new Xev();
@ -12,10 +13,10 @@ const interval = 1000;
* Report server stats regularly * Report server stats regularly
*/ */
export default function() { export default function() {
const log: any[] = []; const log = new Queue<any>();
ev.on('requestServerStatsLog', id => { ev.on('requestServerStatsLog', id => {
ev.emit('serverStatsLog:' + id, log); ev.emit('serverStatsLog:' + id, log.toArray());
}); });
async function tick() { async function tick() {
@ -36,7 +37,7 @@ export default function() {
}; };
ev.emit('serverStats', stats); ev.emit('serverStats', stats);
log.push(stats); log.push(stats);
if (log.length > 50) log.shift(); if (log.length > 50) log.pop();
} }
tick(); tick();

33
src/misc/queue.ts Normal file
View file

@ -0,0 +1,33 @@
type Node<T> = { value: T, next: Node<T> };
export default class Queue<T> {
private top: Node<T> = null;
private rear: Node<T> = null;
public length: number = 0;
public push(value: T): void {
const node: Node<T> = { value, next: null };
if (this.top === null) {
this.top = node;
this.rear = node;
} else {
this.rear.next = node;
this.rear = node;
}
this.length++;
}
public pop(): void {
this.top = this.top.next;
if (this.top == null) this.rear = null;
this.length--;
}
public toArray(): T[] {
const arr: T[] = Array<T>(this.length);
for (let node = this.top, i = 0; node !== null; node = node.next, i++) {
arr[i] = node.value;
}
return arr;
}
}