sendnrw/misskey
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Server] Use logger for logging

Browse Source
This commit is contained in:
syuilo
2019-02-03 04:18:27 +09:00
parent 110eeb89f1
commit 238c6a428b
5 changed files with 34 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/remote/activitypub/logger.ts Normal file
View File

@@ -0,0 +1,3 @@
import { remoteLogger } from "../logger";
export const apLogger = remoteLogger.createSubLogger('ap', 'magenta');

8
src/remote/activitypub/request.ts
View File

@@ -1,7 +1,6 @@
import { request } from 'https';
import { sign } from 'http-signature';
import { URL } from 'url';
import * as debug from 'debug';
import * as crypto from 'crypto';
import { lookup, IRunOptions } from 'lookup-dns-cache';
import * as promiseAny from 'promise-any';
@@ -9,11 +8,12 @@ import * as promiseAny from 'promise-any';
import config from '../../config';
import { ILocalUser } from '../../models/user';
import { publishApLogStream } from '../../stream';
import { apLogger } from './logger';
const log = debug('misskey:activitypub:deliver');
export const logger = apLogger.createSubLogger('deliver');
export default (user: ILocalUser, url: string, object: any) => new Promise(async (resolve, reject) => {
log(`--> ${url}`);
logger.info(`--> ${url}`);
const timeout = 10 * 1000;
@@ -43,7 +43,7 @@ export default (user: ILocalUser, url: string, object: any) => new Promise(async
'Digest': `SHA-256=${hash}`
}
}, res => {
log(`${url} --> ${res.statusCode}`);
logger.info(`${url} --> ${res.statusCode}`);
if (res.statusCode >= 400) {
reject(res);

6
src/remote/activitypub/resolver.ts
View File

@@ -1,9 +1,9 @@
import * as request from 'request-promise-native';
import * as debug from 'debug';
import { IObject } from './type';
import config from '../../config';
import { apLogger } from './logger';
const log = debug('misskey:activitypub:resolver');
export const logger = apLogger.createSubLogger('resolver');
export default class Resolver {
private history: Set<string>;
@@ -67,7 +67,7 @@ export default class Resolver {
!object['@context'].includes('https://www.w3.org/ns/activitystreams') :
object['@context'] !== 'https://www.w3.org/ns/activitystreams'
)) {
log(`invalid response: ${value}`);
logger.error(`invalid response: ${value}`);
throw new Error('invalid response');
}