diff --git a/backend/src/federation/client/1_0/FederationClient.ts b/backend/src/federation/client/1_0/FederationClient.ts index 743d17348..ea3d79a0e 100644 --- a/backend/src/federation/client/1_0/FederationClient.ts +++ b/backend/src/federation/client/1_0/FederationClient.ts @@ -2,10 +2,10 @@ /* eslint-disable @typescript-eslint/no-unsafe-return */ /* eslint-disable @typescript-eslint/no-unsafe-assignment */ import { FederatedCommunity as DbFederatedCommunity } from '@entity/FederatedCommunity' +import { GraphQLError } from 'graphql' import { gql } from 'graphql-request' import { GraphQLGetClient } from '@/federation/client/GraphQLGetClient' -import { LogError } from '@/server/LogError' import { backendLogger as logger } from '@/server/logger' export async function requestGetPublicKey( @@ -25,7 +25,6 @@ export async function requestGetPublicKey( } ` const variables = {} - try { const { data, errors, extensions, headers, status } = await graphQLClient.rawRequest( query, @@ -39,6 +38,9 @@ export async function requestGetPublicKey( } logger.warn(`requestGetPublicKey processed without response data`) } catch (err) { - throw new LogError(`Request-Error:`, err) + if (err instanceof GraphQLError) { + logger.error(`RawRequest-Error on {} with message {}`, endpoint, err.message) + } + throw new Error(`Request-Error in requestGetPublicKey.`) } } diff --git a/backend/src/federation/client/1_1/FederationClient.ts b/backend/src/federation/client/1_1/FederationClient.ts index 35c88bf3b..db0c3fa07 100644 --- a/backend/src/federation/client/1_1/FederationClient.ts +++ b/backend/src/federation/client/1_1/FederationClient.ts @@ -2,10 +2,10 @@ /* eslint-disable @typescript-eslint/no-unsafe-assignment */ /* eslint-disable @typescript-eslint/no-unsafe-member-access */ import { FederatedCommunity as DbFederatedCommunity } from '@entity/FederatedCommunity' +import { GraphQLError } from 'graphql' import { gql } from 'graphql-request' import { GraphQLGetClient } from '@/federation/client/GraphQLGetClient' -import { LogError } from '@/server/LogError' import { backendLogger as logger } from '@/server/logger' export async function requestGetPublicKey( @@ -25,7 +25,6 @@ export async function requestGetPublicKey( } ` const variables = {} - try { const { data, errors, extensions, headers, status } = await graphQLClient.rawRequest( query, @@ -39,6 +38,9 @@ export async function requestGetPublicKey( } logger.warn(`requestGetPublicKey processed without response data`) } catch (err) { - throw new LogError(`Request-Error:`, err) + if (err instanceof GraphQLError) { + logger.error(`RawRequest-Error on {} with message {}`, endpoint, err.message) + } + throw new Error(`Request-Error in requestGetPublicKey`) // :${err}`) } } diff --git a/backend/src/federation/validateCommunities.ts b/backend/src/federation/validateCommunities.ts index b38f38ee9..5f7d9b876 100644 --- a/backend/src/federation/validateCommunities.ts +++ b/backend/src/federation/validateCommunities.ts @@ -60,9 +60,7 @@ export async function validateCommunities(): Promise { // DbCommunity.delete({ id: dbCom.id }) } } catch (err) { - if (!isLogError(err)) { - logger.error(`Error:`, err) - } + logger.error(`Error:`, err) } } else { logger.warn( @@ -73,10 +71,6 @@ export async function validateCommunities(): Promise { } } -function isLogError(err: unknown) { - return err instanceof LogError -} - async function invokeVersionedRequestGetPublicKey( dbCom: DbFederatedCommunity, ): Promise {