From d50624f0a0602c3122b218029ddc40bbb78011e0 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sun, 3 Mar 2019 07:47:58 +0900 Subject: [PATCH] Better logs --- src/remote/activitypub/resolver.ts | 12 +++++++++--- src/services/drive/add-file.ts | 2 +- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/remote/activitypub/resolver.ts b/src/remote/activitypub/resolver.ts index 113b2c4e4..0c435cf91 100644 --- a/src/remote/activitypub/resolver.ts +++ b/src/remote/activitypub/resolver.ts @@ -49,7 +49,7 @@ export default class Resolver { } if (this.history.has(value)) { - logger.error(`cannot resolve already resolved one`); + logger.error(`cannot resolve already resolved one: ${value}`); throw new Error('cannot resolve already resolved one'); } @@ -65,7 +65,10 @@ export default class Resolver { }, json: true }).catch(e => { - logger.error(`request error: ${e.message}`); + logger.error(`request error: ${value}: ${e.message}`, { + url: value, + e: e + }); throw new Error(`request error: ${e.message}`); }); @@ -74,7 +77,10 @@ export default class Resolver { !object['@context'].includes('https://www.w3.org/ns/activitystreams') : object['@context'] !== 'https://www.w3.org/ns/activitystreams' )) { - logger.error(`invalid response: ${value}`); + logger.error(`invalid response: ${value}`, { + url: value, + object: object + }); throw new Error('invalid response'); } diff --git a/src/services/drive/add-file.ts b/src/services/drive/add-file.ts index 9f3805f94..ab9fdc0c9 100644 --- a/src/services/drive/add-file.ts +++ b/src/services/drive/add-file.ts @@ -378,7 +378,7 @@ export default async function( return 0; }); - logger.info(`drive usage is ${usage}`); + logger.debug(`drive usage is ${usage}`); const instance = await fetchMeta(); const driveCapacity = 1024 * 1024 * (isLocalUser(user) ? instance.localDriveCapacityMb : instance.remoteDriveCapacityMb);