feat: add active to federation chart

This commit is contained in:
syuilo 2022-03-07 15:10:16 +09:00
parent 8ca8d77c1e
commit ec64b5ea0b
5 changed files with 30 additions and 2 deletions

View File

@ -24,6 +24,7 @@ You should also include the user name that made the change.
- アンケートが終了したときに通知が作成されるように @syuilo - アンケートが終了したときに通知が作成されるように @syuilo
- プロフィールの追加情報を最大16まで保存できるように @syuilo - プロフィールの追加情報を最大16まで保存できるように @syuilo
- 連合チャートにPub&Subを追加 @syuilo - 連合チャートにPub&Subを追加 @syuilo
- 連合チャートにActiveを追加 @syuilo
- デフォルトで10秒以上時間がかかるデータベースへのクエリは中断されるように @syuilo - デフォルトで10秒以上時間がかかるデータベースへのクエリは中断されるように @syuilo
- 設定ファイルの`db.extra`に`statement_timeout`を設定することでタイムアウト時間を変更できます - 設定ファイルの`db.extra`に`statement_timeout`を設定することでタイムアウト時間を変更できます

View File

@ -0,0 +1,13 @@
export class chartFederationActive1646633030285 {
name = 'chartFederationActive1646633030285'
async up(queryRunner) {
await queryRunner.query(`ALTER TABLE "__chart__federation" ADD "___active" smallint NOT NULL DEFAULT '0'`);
await queryRunner.query(`ALTER TABLE "__chart_day__federation" ADD "___active" smallint NOT NULL DEFAULT '0'`);
}
async down(queryRunner) {
await queryRunner.query(`ALTER TABLE "__chart_day__federation" DROP COLUMN "___active"`);
await queryRunner.query(`ALTER TABLE "__chart__federation" DROP COLUMN "___active"`);
}
}

View File

@ -9,6 +9,7 @@ export const schema = {
'sub': { accumulate: true, range: 'small' }, 'sub': { accumulate: true, range: 'small' },
'pub': { accumulate: true, range: 'small' }, 'pub': { accumulate: true, range: 'small' },
'pubsub': { accumulate: true, range: 'small' }, 'pubsub': { accumulate: true, range: 'small' },
'active': { accumulate: true, range: 'small' },
} as const; } as const;
export const entity = Chart.schemaToEntity(name, schema); export const entity = Chart.schemaToEntity(name, schema);

View File

@ -2,6 +2,7 @@ import Chart, { KVs } from '../core.js';
import { Followings, Instances } from '@/models/index.js'; import { Followings, Instances } from '@/models/index.js';
import { name, schema } from './entities/federation.js'; import { name, schema } from './entities/federation.js';
import { fetchMeta } from '@/misc/fetch-meta.js'; import { fetchMeta } from '@/misc/fetch-meta.js';
import { In, MoreThan, Not } from 'typeorm';
/** /**
* *
@ -28,7 +29,7 @@ export default class FederationChart extends Chart<typeof schema> {
.select('f.followerHost') .select('f.followerHost')
.where('f.followerHost IS NOT NULL'); .where('f.followerHost IS NOT NULL');
const [sub, pub, pubsub] = await Promise.all([ const [sub, pub, pubsub, active] = await Promise.all([
Followings.createQueryBuilder('following') Followings.createQueryBuilder('following')
.select('COUNT(DISTINCT following.followeeHost)') .select('COUNT(DISTINCT following.followeeHost)')
.where('following.followeeHost IS NOT NULL') .where('following.followeeHost IS NOT NULL')
@ -52,12 +53,18 @@ export default class FederationChart extends Chart<typeof schema> {
.setParameters(pubsubSubQuery.getParameters()) .setParameters(pubsubSubQuery.getParameters())
.getRawOne() .getRawOne()
.then(x => parseInt(x.count, 10)), .then(x => parseInt(x.count, 10)),
Instances.count({
host: Not(In(meta.blockedHosts)),
isSuspended: false,
lastCommunicatedAt: MoreThan(new Date(Date.now() - (1000 * 60 * 60 * 24 * 30))),
}),
]); ]);
return { return {
'sub': sub, 'sub': sub,
'pub': pub, 'pub': pub,
'pubsub': pubsub, 'pubsub': pubsub,
'active': active,
}; };
} }

View File

@ -71,6 +71,7 @@ const colors = {
purple: '#e300db', purple: '#e300db',
orange: '#fe6919', orange: '#fe6919',
lime: '#c7f400', lime: '#c7f400',
cyan: '#00efef',
}; };
const colorSets = [colors.blue, colors.green, colors.yellow, colors.red, colors.purple]; const colorSets = [colors.blue, colors.green, colors.yellow, colors.red, colors.purple];
const getColor = (i) => { const getColor = (i) => {
@ -388,11 +389,16 @@ export default defineComponent({
type: 'area', type: 'area',
data: format(raw.stalled), data: format(raw.stalled),
color: colors.red, color: colors.red,
}, {
name: 'Active',
type: 'line',
data: format(raw.active),
color: colors.lime,
}, { }, {
name: 'Pub & Sub', name: 'Pub & Sub',
type: 'line', type: 'line',
data: format(raw.pubsub), data: format(raw.pubsub),
color: colors.lime, color: colors.cyan,
}, { }, {
name: 'Pub', name: 'Pub',
type: 'line', type: 'line',