usbharu
/
misskey
mirror of https://github.com/misskey-dev/misskey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

enhance logger and error handling

This commit is contained in:
tamaina 2023-01-03 13:43:37 +00:00
parent 071a1730b9
commit e15c773b2c
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/backend/src/core/HttpRequestService.ts
View File

@ -59,6 +59,7 @@ export class UndiciFetcher {
connect: (process.env.NODE_ENV !== 'production' && typeof args.agentOptions.connect !== 'function') connect: (process.env.NODE_ENV !== 'production' && typeof args.agentOptions.connect !== 'function')
? (options, cb) => { ? (options, cb) => {
undici.buildConnector(args.agentOptions.connect as undici.buildConnector.BuildOptions)(options, (err, socket) => { undici.buildConnector(args.agentOptions.connect as undici.buildConnector.BuildOptions)(options, (err, socket) => {
this.logger?.debug('Socket connector called', socket);
if (err) { if (err) {
this.logger?.debug(`Socket error`, err); this.logger?.debug(`Socket error`, err);
cb(new Error(`Error while socket connecting\n${err}`), null); cb(new Error(`Error while socket connecting\n${err}`), null);
@ -80,6 +81,7 @@ export class UndiciFetcher {
connect: (process.env.NODE_ENV !== 'production' && typeof (args.proxy?.options?.connect ?? args.agentOptions.connect) !== 'function') connect: (process.env.NODE_ENV !== 'production' && typeof (args.proxy?.options?.connect ?? args.agentOptions.connect) !== 'function')
? (options, cb) => { ? (options, cb) => {
undici.buildConnector((args.proxy?.options?.connect ?? args.agentOptions.connect) as undici.buildConnector.BuildOptions)(options, (err, socket) => { undici.buildConnector((args.proxy?.options?.connect ?? args.agentOptions.connect) as undici.buildConnector.BuildOptions)(options, (err, socket) => {
this.logger?.debug('Socket connector called', socket);
if (err) { if (err) {
this.logger?.debug(`Socket error`, err); this.logger?.debug(`Socket error`, err);
cb(new Error(`Error while socket connecting\n${err}`), null); cb(new Error(`Error while socket connecting\n${err}`), null);
@ -116,7 +118,10 @@ export class UndiciFetcher {
const res = await undici.fetch(url, { const res = await undici.fetch(url, {
dispatcher: this.getAgentByUrl(new URL(url), privateOptions.bypassProxy), dispatcher: this.getAgentByUrl(new URL(url), privateOptions.bypassProxy),
...options, ...options,
}) }).catch((err) => {
this.logger?.error('fetch error', err);
throw new StatusError('Resource Unreachable', 500, 'Resource Unreachable');
});
if (!res.ok && !privateOptions.noOkError) { if (!res.ok && !privateOptions.noOkError) {
throw new StatusError(`${res.status} ${res.statusText}`, res.status, res.statusText); throw new StatusError(`${res.status} ${res.statusText}`, res.status, res.statusText);
} }
@ -304,8 +309,8 @@ export class HttpRequestService {
@bindThis @bindThis
public getConnectorWithIpCheck(connector: undici.buildConnector.connector, checkIp: IpChecker): undici.buildConnector.connectorAsync { public getConnectorWithIpCheck(connector: undici.buildConnector.connector, checkIp: IpChecker): undici.buildConnector.connectorAsync {
return (options, cb) => { return (options, cb) => {
this.logger.debug('socket connecting...')
connector(options, (err, socket) => { connector(options, (err, socket) => {
this.logger.debug('Socket connector called', socket);
if (err) { if (err) {
this.logger.error(`Socket error`, err) this.logger.error(`Socket error`, err)
cb(new Error(`Error while socket connecting\n${err}`), null); cb(new Error(`Error while socket connecting\n${err}`), null);