summaryrefslogtreecommitdiff
path: root/src/server
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2018-10-21 15:08:07 +0900
committersyuilo <syuilotan@yahoo.co.jp>2018-10-21 15:08:07 +0900
commit6b0d48423d249b386d2428b46a14dea76bf231e9 (patch)
tree897a457276ed744938ec132ab1ad9d086267f436 /src/server
parentRefactor (diff)
downloadsharkey-6b0d48423d249b386d2428b46a14dea76bf231e9.tar.gz
sharkey-6b0d48423d249b386d2428b46a14dea76bf231e9.tar.bz2
sharkey-6b0d48423d249b386d2428b46a14dea76bf231e9.zip
Refactor
Diffstat (limited to 'src/server')
-rw-r--r--src/server/api/endpoints/charts/drive.ts4
-rw-r--r--src/server/api/endpoints/charts/network.ts4
-rw-r--r--src/server/api/endpoints/charts/notes.ts4
-rw-r--r--src/server/api/endpoints/charts/users.ts4
-rw-r--r--src/server/api/private/signup.ts4
-rw-r--r--src/server/index.ts4
6 files changed, 12 insertions, 12 deletions
diff --git a/src/server/api/endpoints/charts/drive.ts b/src/server/api/endpoints/charts/drive.ts
index 0572200d6c..f090a7f5f1 100644
--- a/src/server/api/endpoints/charts/drive.ts
+++ b/src/server/api/endpoints/charts/drive.ts
@@ -1,6 +1,6 @@
import $ from 'cafy';
import getParams from '../../get-params';
-import { driveChart } from '../../../../services/stats';
+import { driveStats } from '../../../../services/stats';
export const meta = {
desc: {
@@ -27,7 +27,7 @@ export default (params: any) => new Promise(async (res, rej) => {
const [ps, psErr] = getParams(meta, params);
if (psErr) throw psErr;
- const stats = await driveChart.getStats(ps.span as any, ps.limit);
+ const stats = await driveStats.getChart(ps.span as any, ps.limit);
res(stats);
});
diff --git a/src/server/api/endpoints/charts/network.ts b/src/server/api/endpoints/charts/network.ts
index 236674de7c..07ba19d5e0 100644
--- a/src/server/api/endpoints/charts/network.ts
+++ b/src/server/api/endpoints/charts/network.ts
@@ -1,6 +1,6 @@
import $ from 'cafy';
import getParams from '../../get-params';
-import { networkChart } from '../../../../services/stats';
+import { networkStats } from '../../../../services/stats';
export const meta = {
desc: {
@@ -27,7 +27,7 @@ export default (params: any) => new Promise(async (res, rej) => {
const [ps, psErr] = getParams(meta, params);
if (psErr) throw psErr;
- const stats = await networkChart.getStats(ps.span as any, ps.limit);
+ const stats = await networkStats.getChart(ps.span as any, ps.limit);
res(stats);
});
diff --git a/src/server/api/endpoints/charts/notes.ts b/src/server/api/endpoints/charts/notes.ts
index 1efd587519..06ed3b7d41 100644
--- a/src/server/api/endpoints/charts/notes.ts
+++ b/src/server/api/endpoints/charts/notes.ts
@@ -1,6 +1,6 @@
import $ from 'cafy';
import getParams from '../../get-params';
-import { notesChart } from '../../../../services/stats';
+import { notesStats } from '../../../../services/stats';
export const meta = {
desc: {
@@ -27,7 +27,7 @@ export default (params: any) => new Promise(async (res, rej) => {
const [ps, psErr] = getParams(meta, params);
if (psErr) throw psErr;
- const stats = await notesChart.getStats(ps.span as any, ps.limit);
+ const stats = await notesStats.getChart(ps.span as any, ps.limit);
res(stats);
});
diff --git a/src/server/api/endpoints/charts/users.ts b/src/server/api/endpoints/charts/users.ts
index 21f5e03523..1dea4d5c4d 100644
--- a/src/server/api/endpoints/charts/users.ts
+++ b/src/server/api/endpoints/charts/users.ts
@@ -1,6 +1,6 @@
import $ from 'cafy';
import getParams from '../../get-params';
-import { usersChart } from '../../../../services/stats';
+import { usersStats } from '../../../../services/stats';
export const meta = {
desc: {
@@ -27,7 +27,7 @@ export default (params: any) => new Promise(async (res, rej) => {
const [ps, psErr] = getParams(meta, params);
if (psErr) throw psErr;
- const stats = await usersChart.getStats(ps.span as any, ps.limit);
+ const stats = await usersStats.getChart(ps.span as any, ps.limit);
res(stats);
});
diff --git a/src/server/api/private/signup.ts b/src/server/api/private/signup.ts
index 99ad9cbccd..caab0267c4 100644
--- a/src/server/api/private/signup.ts
+++ b/src/server/api/private/signup.ts
@@ -7,7 +7,7 @@ import generateUserToken from '../common/generate-native-user-token';
import config from '../../../config';
import Meta from '../../../models/meta';
import RegistrationTicket from '../../../models/registration-tickets';
-import { usersChart } from '../../../services/stats';
+import { usersStats } from '../../../services/stats';
if (config.recaptcha) {
recaptcha.init({
@@ -130,7 +130,7 @@ export default async (ctx: Koa.Context) => {
}, { upsert: true });
//#endregion
- usersChart.update(account, true);
+ usersStats.update(account, true);
const res = await pack(account, account, {
detail: true,
diff --git a/src/server/index.ts b/src/server/index.ts
index ae989caff5..848727fb1e 100644
--- a/src/server/index.ts
+++ b/src/server/index.ts
@@ -17,7 +17,7 @@ const requestStats = require('request-stats');
import activityPub from './activitypub';
import webFinger from './webfinger';
import config from '../config';
-import { networkChart } from '../services/stats';
+import { networkStats } from '../services/stats';
import apiServer from './api';
// Init app
@@ -104,7 +104,7 @@ export default () => new Promise(resolve => {
const outgoingBytes = queue.reduce((a, b) => a + b.res.bytes, 0);
queue = [];
- networkChart.update(requests, time, incomingBytes, outgoingBytes);
+ networkStats.update(requests, time, incomingBytes, outgoingBytes);
}, 5000);
//#endregion
});