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

Better logs

Browse source
This commit is contained in:
syuilo 2019-03-03 07:47:58 +09:00
parent 4f9b015d1c
commit d50624f0a0
No known key found for this signature in database
GPG key ID: BDC4C49D06AB9D69
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/remote/activitypub/resolver.ts
View file

@ -49,7 +49,7 @@ export default class Resolver {
} }
if (this.history.has(value)) { 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'); throw new Error('cannot resolve already resolved one');
} }
@ -65,7 +65,10 @@ export default class Resolver {
}, },
json: true json: true
}).catch(e => { }).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}`); 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'].includes('https://www.w3.org/ns/activitystreams') :
object['@context'] !== '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'); throw new Error('invalid response');
} }

2
src/services/drive/add-file.ts
View file

@ -378,7 +378,7 @@ export default async function(
return 0; return 0;
}); });
logger.info(`drive usage is ${usage}`); logger.debug(`drive usage is ${usage}`);
const instance = await fetchMeta(); const instance = await fetchMeta();
const driveCapacity = 1024 * 1024 * (isLocalUser(user) ? instance.localDriveCapacityMb : instance.remoteDriveCapacityMb); const driveCapacity = 1024 * 1024 * (isLocalUser(user) ? instance.localDriveCapacityMb : instance.remoteDriveCapacityMb);