Mizah/Sharkey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use internal logger instead of debug/console for logging

Browse source 
Resolve #4104
Resolve #1966
Resolve #1937
This commit is contained in:
syuilo 2019-02-03 18:16:57 +09:00
parent 3a5867b324
commit 0868c3517f
No known key found for this signature in database
GPG key ID: BDC4C49D06AB9D69
41 changed files with 136 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/remote/activitypub/kernel/announce/index.ts
View file

@ -1,16 +1,15 @@
import * as debug from 'debug';
import Resolver from '../../resolver';
import { IRemoteUser } from '../../../../models/user';
import announceNote from './note';
import { IAnnounce, INote } from '../../type';
import { apLogger } from '../../logger';
const log = debug('misskey:activitypub');
const logger = apLogger;
export default async (actor: IRemoteUser, activity: IAnnounce): Promise<void> => {
const uri = activity.id || activity;
log(`Announce: ${uri}`);
logger.info(`Announce: ${uri}`);
const resolver = new Resolver();
@ -19,7 +18,7 @@ export default async (actor: IRemoteUser, activity: IAnnounce): Promise<void> =>
try {
object = await resolver.resolve(activity.object);
} catch (e) {
log(`Resolution failed: ${e}`);
logger.error(`Resolution failed: ${e}`);
throw e;
}
@ -29,7 +28,7 @@ export default async (actor: IRemoteUser, activity: IAnnounce): Promise<void> =>
break;
default:
console.warn(`Unknown announce type: ${object.type}`);
logger.warn(`Unknown announce type: ${object.type}`);
break;
}
};

7
src/remote/activitypub/kernel/announce/note.ts
View file

@ -1,13 +1,12 @@
import * as debug from 'debug';
import Resolver from '../../resolver';
import post from '../../../../services/note/create';
import { IRemoteUser, IUser } from '../../../../models/user';
import { IAnnounce, INote } from '../../type';
import { fetchNote, resolveNote } from '../../models/note';
import { resolvePerson } from '../../models/person';
import { apLogger } from '../../logger';
const log = debug('misskey:activitypub');
const logger = apLogger;
/**
* アナウンスアクティビティを捌きます
@ -32,7 +31,7 @@ export default async function(resolver: Resolver, actor: IRemoteUser, activity:
const renote = await resolveNote(note);
log(`Creating the (Re)Note: ${uri}`);
logger.info(`Creating the (Re)Note: ${uri}`);
//#region Visibility
const visibility = getVisibility(activity.to, activity.cc, actor);