graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-11-30 17:13:08 +02:00
Code Issues Projects Releases Packages Wiki Activity

[Server] Use logger for logging

Browse source
This commit is contained in:
syuilo 2019-02-03 04:04:57 +09:00
parent d55277e57e
commit 278e43e9ba
No known key found for this signature in database
GPG key ID: BDC4C49D06AB9D69
2 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -0,0 +1,3 @@
import Logger from "../misc/logger";
export const remoteLogger = new Logger('remote', 'blue');

24
src/remote/resolve-user.ts
View file

@ -4,15 +4,15 @@ import webFinger from './webfinger';
import config from '../config'; import config from '../config';
import { createPerson, updatePerson } from './activitypub/models/person'; import { createPerson, updatePerson } from './activitypub/models/person';
import { URL } from 'url'; import { URL } from 'url';
import * as debug from 'debug'; import { remoteLogger } from './logger';
const log = debug('misskey:remote:resolve-user'); const logger = remoteLogger.createSubLogger('resolve-user');
export default async (username: string, _host: string, option?: any, resync?: boolean): Promise<IUser> => { export default async (username: string, _host: string, option?: any, resync?: boolean): Promise<IUser> => {
const usernameLower = username.toLowerCase(); const usernameLower = username.toLowerCase();
if (_host == null) { if (_host == null) {
log(`return local user: ${usernameLower}`); logger.info(`return local user: ${usernameLower}`);
return await User.findOne({ usernameLower, host: null }); return await User.findOne({ usernameLower, host: null });
} }
@ -23,7 +23,7 @@ export default async (username: string, _host: string, option?: any, resync?: bo
const host = toUnicode(hostAscii); const host = toUnicode(hostAscii);
if (configHost == host) { if (configHost == host) {
log(`return local user: ${usernameLower}`); logger.info(`return local user: ${usernameLower}`);
return await User.findOne({ usernameLower, host: null }); return await User.findOne({ usernameLower, host: null });
} }
@ -34,18 +34,18 @@ export default async (username: string, _host: string, option?: any, resync?: bo
if (user === null) { if (user === null) {
const self = await resolveSelf(acctLower); const self = await resolveSelf(acctLower);
log(`return new remote user: ${acctLower}`); logger.info(`return new remote user: ${acctLower}`);
return await createPerson(self.href); return await createPerson(self.href);
} }
if (resync) { if (resync) {
log(`try resync: ${acctLower}`); logger.info(`try resync: ${acctLower}`);
const self = await resolveSelf(acctLower); const self = await resolveSelf(acctLower);
if ((user as IRemoteUser).uri !== self.href) { if ((user as IRemoteUser).uri !== self.href) {
// if uri mismatch, Fix (user@host <=> AP's Person id(IRemoteUser.uri)) mapping. // if uri mismatch, Fix (user@host <=> AP's Person id(IRemoteUser.uri)) mapping.
log(`uri missmatch: ${acctLower}`); logger.info(`uri missmatch: ${acctLower}`);
console.log(`recovery missmatch uri for (username=${username}, host=${host}) from ${(user as IRemoteUser).uri} to ${self.href}`); logger.info(`recovery missmatch uri for (username=${username}, host=${host}) from ${(user as IRemoteUser).uri} to ${self.href}`);
// validate uri // validate uri
const uri = new URL(self.href); const uri = new URL(self.href);
@ -62,21 +62,21 @@ export default async (username: string, _host: string, option?: any, resync?: bo
} }
}); });
} else { } else {
log(`uri is fine: ${acctLower}`); logger.info(`uri is fine: ${acctLower}`);
} }
await updatePerson(self.href); await updatePerson(self.href);
log(`return resynced remote user: ${acctLower}`); logger.info(`return resynced remote user: ${acctLower}`);
return await User.findOne({ uri: self.href }); return await User.findOne({ uri: self.href });
} }
log(`return existing remote user: ${acctLower}`); logger.info(`return existing remote user: ${acctLower}`);
return user; return user;
}; };
async function resolveSelf(acctLower: string) { async function resolveSelf(acctLower: string) {
log(`WebFinger for ${acctLower}`); logger.info(`WebFinger for ${acctLower}`);
const finger = await webFinger(acctLower); const finger = await webFinger(acctLower);
const self = finger.links.find(link => link.rel && link.rel.toLowerCase() === 'self'); const self = finger.links.find(link => link.rel && link.rel.toLowerCase() === 'self');
if (!self) { if (!self) {