From 3e22b0780697a2ac2858637d0da3ddcacc1c386a Mon Sep 17 00:00:00 2001 From: Claus-Peter Huebner Date: Fri, 19 May 2023 17:19:21 +0200 Subject: [PATCH] optimize log-output --- backend/src/federation/client/1_0/FederationClient.ts | 11 ++++------- backend/src/federation/validateCommunities.ts | 10 +++------- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/backend/src/federation/client/1_0/FederationClient.ts b/backend/src/federation/client/1_0/FederationClient.ts index 69e67efcb..170b4e954 100644 --- a/backend/src/federation/client/1_0/FederationClient.ts +++ b/backend/src/federation/client/1_0/FederationClient.ts @@ -51,7 +51,7 @@ export class FederationClient { } getPublicCommunityInfo = async (): Promise => { - logger.info(`getPublicCommunityInfo with endpoint='${this.endpoint}'...`) + logger.info(`Federation: getPublicCommunityInfo with endpoint='${this.endpoint}'...`) try { // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment const { data } = await this.client.rawRequest(getPublicCommunityInfo, {}) @@ -63,12 +63,9 @@ export class FederationClient { ) return } - logger.info( - 'Federation: getPublicCommunityInfo successful from endpoint', - this.endpoint, - // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access - data.getPublicCommunityInfo, - ) + logger.info(`Federation: getPublicCommunityInfo successful from endpoint=${this.endpoint}`) + // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access + logger.debug(`publicCommunityInfo:`, data.getPublicCommunityInfo) // eslint-disable-next-line @typescript-eslint/no-unsafe-return, @typescript-eslint/no-unsafe-member-access return data.getPublicCommunityInfo } catch (err) { diff --git a/backend/src/federation/validateCommunities.ts b/backend/src/federation/validateCommunities.ts index 9fcbdda23..6bb020687 100644 --- a/backend/src/federation/validateCommunities.ts +++ b/backend/src/federation/validateCommunities.ts @@ -47,18 +47,14 @@ export async function validateCommunities(): Promise { const pubKey = await client.getPublicKey() if (pubKey && pubKey === dbCom.publicKey.toString()) { await DbFederatedCommunity.update({ id: dbCom.id }, { verifiedAt: new Date() }) - logger.info('Federation: verified community', dbCom) + logger.info(`Federation: verified community: id=${dbCom.id}, endpoint=${dbCom.endPoint}`) const pubComInfo = await client.getPublicCommunityInfo() if (pubComInfo) { await writeForeignCommunity(dbCom, pubComInfo) - logger.info(`Federation: write foreign community... successfully`) + logger.info(`Federation: write publicInfo of community: name=${pubComInfo.name}`) } } else { - logger.warn( - 'Federation: received not matching publicKey:', - pubKey, - dbCom.publicKey.toString(), - ) + logger.warn(`Federation: received none or not matching publicKey...`) } } } catch (err) {