Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
} from '@nestjs/common';
import logger from '../../logger';
import { AxiosError } from 'axios';
import * as httpUtils from '../utils/http';
import * as errorUtils from '../utils/error';

@Catch()
export class ExceptionFilter implements IExceptionFilter {
Expand All @@ -30,7 +30,7 @@ export class ExceptionFilter implements IExceptionFilter {
} else {
let formattedError = exception;
if (exception instanceof AxiosError) {
formattedError = httpUtils.formatAxiosError(exception);
formattedError = errorUtils.formatError(exception);
}
this.logger.error('Unhandled exception', formattedError);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Injectable } from '@nestjs/common';
import axios from 'axios';
import * as httpUtils from '../../common/utils/http';
import * as errorUtils from '../utils/error';
import logger from '../../logger';

// This interceptor injection is guarded via IS_AXIOS_REQUEST_LOGGING_ENABLED environment variable.
Expand Down Expand Up @@ -29,7 +29,7 @@ export class AxiosRequestInterceptor {
},
(error) => {
this.logger.error('Request error', {
error: httpUtils.formatAxiosError(error),
error: errorUtils.formatError(error),
});
return Promise.reject(error);
},
Expand All @@ -39,7 +39,7 @@ export class AxiosRequestInterceptor {
(response) => response,
(error) => {
this.logger.error('Response error', {
error: httpUtils.formatAxiosError(error),
error: errorUtils.formatError(error),
});
return Promise.reject(error);
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
import { AxiosError } from 'axios';

export function formatAxiosError(error: AxiosError) {
export function formatError(error: Error) {
return {
name: error.name,
message: error.message,
stack: error.stack,
cause: error.cause,
message: error.message,
};
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { AxiosRequestConfig } from 'axios';
import { lastValueFrom } from 'rxjs';
import { HttpMethod } from '../../common/enums/http-method';
import { toCleanObjParams } from '../../common/utils/gateway-common.utils';
import * as httpUtils from '../../common/utils/http';
import * as errorUtils from '../../common/utils/error';
import logger from '../../logger';
import {
JobAssignmentCommand,
Expand Down Expand Up @@ -65,7 +65,7 @@ export class ExchangeOracleGateway {
url: options.url,
method: options.method,
data: options.data,
error: httpUtils.formatAxiosError(error),
error: errorUtils.formatError(error),
});
throw error;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {
} from '../../common/interfaces/endpoint.interface';
import { toCleanObjParams } from '../../common/utils/gateway-common.utils';
import logger from '../../logger';
import * as httpUtils from '../../common/utils/http';
import * as errorUtils from '../../common/utils/error';
import {
VerifyTokenApiResponse,
VerifyTokenCommand,
Expand Down Expand Up @@ -80,7 +80,7 @@ export class HCaptchaVerifyGateway {
return response.data;
} catch (error) {
this.logger.error('Error while sending hCaptcha token for verification', {
error: httpUtils.formatAxiosError(error),
error: errorUtils.formatError(error),
});
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
import { Injectable } from '@nestjs/common';
import { SchedulerRegistry } from '@nestjs/schedule';
import { AxiosError } from 'axios';
import { CronJob } from 'cron';
import { EnvironmentConfigService } from '../../common/config/environment-config.service';
import {
JobDiscoveryFieldName,
JobStatus,
} from '../../common/enums/global-common';
import * as errorUtils from '../../common/utils/error';
import { ExchangeOracleGateway } from '../../integrations/exchange-oracle/exchange-oracle.gateway';
import { ReputationOracleGateway } from '../../integrations/reputation-oracle/reputation-oracle.gateway';
import logger from '../../logger';
Expand Down Expand Up @@ -101,7 +103,11 @@ export class CronJobService {
);
}
} catch (error) {
this.logger.error('Error in update jobs list job', error);
let formattedError = error;
if (error instanceof AxiosError) {
formattedError = errorUtils.formatError(error);
}
this.logger.error('Error in update jobs list job', formattedError);
}

this.logger.info('Update jobs list END');
Expand Down Expand Up @@ -156,10 +162,14 @@ export class CronJobService {

await this.jobsDiscoveryService.setCachedJobs(oracle.address, allResults);
} catch (error) {
let formattedError = error;
if (error instanceof AxiosError) {
formattedError = errorUtils.formatError(error);
}
this.logger.error('Error while updating jobs list for oracle', {
chainId: oracle.chainId,
address: oracle.address,
error,
error: formattedError,
});
await this.handleJobListError(oracle);
}
Expand Down
Loading