summaryrefslogtreecommitdiff
path: root/packages/backend/src
diff options
context:
space:
mode:
authorHazelnoot <acomputerdog@gmail.com>2025-05-22 09:53:13 -0400
committerHazelnoot <acomputerdog@gmail.com>2025-06-06 22:20:16 -0400
commit6d6e1dc0c0cc2041b01604b4a7d0cf30b8596ea6 (patch)
tree51c9866ca36f79a338511f96536a16bdc48c8fea /packages/backend/src
parentreduce log spam from DriveService (diff)
downloadsharkey-6d6e1dc0c0cc2041b01604b4a7d0cf30b8596ea6.tar.gz
sharkey-6d6e1dc0c0cc2041b01604b4a7d0cf30b8596ea6.tar.bz2
sharkey-6d6e1dc0c0cc2041b01604b4a7d0cf30b8596ea6.zip
reduce log spam from DownloadService
Diffstat (limited to 'packages/backend/src')
-rw-r--r--packages/backend/src/core/DownloadService.ts15
-rw-r--r--packages/backend/src/misc/status-error.ts4
2 files changed, 10 insertions, 9 deletions
diff --git a/packages/backend/src/core/DownloadService.ts b/packages/backend/src/core/DownloadService.ts
index cb958f5001..5d0aaa9945 100644
--- a/packages/backend/src/core/DownloadService.ts
+++ b/packages/backend/src/core/DownloadService.ts
@@ -18,6 +18,7 @@ import { LoggerService } from '@/core/LoggerService.js';
import type Logger from '@/logger.js';
import { bindThis } from '@/decorators.js';
+import { renderInlineError } from '@/misc/render-inline-error.js';
@Injectable()
export class DownloadService {
@@ -37,7 +38,7 @@ export class DownloadService {
public async downloadUrl(url: string, path: string, options: { timeout?: number, operationTimeout?: number, maxSize?: number } = {} ): Promise<{
filename: string;
}> {
- this.logger.info(`Downloading ${chalk.cyan(url)} to ${chalk.cyanBright(path)} ...`);
+ this.logger.debug(`Downloading ${chalk.cyan(url)} to ${chalk.cyanBright(path)} ...`);
const timeout = options.timeout ?? 30 * 1000;
const operationTimeout = options.operationTimeout ?? 60 * 1000;
@@ -86,7 +87,7 @@ export class DownloadService {
filename = parsed.parameters.filename;
}
} catch (e) {
- this.logger.warn(`Failed to parse content-disposition: ${contentDisposition}`, { stack: e });
+ this.logger.warn(`Failed to parse content-disposition ${contentDisposition}: ${renderInlineError(e)}`);
}
}
}).on('downloadProgress', (progress: Got.Progress) => {
@@ -100,17 +101,17 @@ export class DownloadService {
await stream.pipeline(req, fs.createWriteStream(path));
} catch (e) {
if (e instanceof Got.HTTPError) {
- throw new StatusError(`${e.response.statusCode} ${e.response.statusMessage}`, e.response.statusCode, e.response.statusMessage);
+ throw new StatusError(`${e.response.statusCode} ${e.response.statusMessage}`, e.response.statusCode, e.response.statusMessage, e);
} else if (e instanceof Got.RequestError || e instanceof Got.AbortError) {
- throw new Error(String(e));
+ throw new Error(String(e), { cause: e });
} else if (e instanceof Error) {
throw e;
} else {
- throw new Error(String(e));
+ throw new Error(String(e), { cause: e });
}
}
- this.logger.succ(`Download finished: ${chalk.cyan(url)}`);
+ this.logger.info(`Download finished: ${chalk.cyan(url)}`);
return {
filename,
@@ -122,7 +123,7 @@ export class DownloadService {
// Create temp file
const [path, cleanup] = await createTemp();
- this.logger.info(`text file: Temp file is ${path}`);
+ this.logger.debug(`text file: Temp file is ${path}`);
try {
// write content at URL to temp file
diff --git a/packages/backend/src/misc/status-error.ts b/packages/backend/src/misc/status-error.ts
index c3533db607..2c70d28f8d 100644
--- a/packages/backend/src/misc/status-error.ts
+++ b/packages/backend/src/misc/status-error.ts
@@ -9,8 +9,8 @@ export class StatusError extends Error {
public isClientError: boolean;
public isRetryable: boolean;
- constructor(message: string, statusCode: number, statusMessage?: string) {
- super(message);
+ constructor(message: string, statusCode: number, statusMessage?: string, options?: ErrorOptions) {
+ super(message, options);
this.name = 'StatusError';
this.statusCode = statusCode;
this.statusMessage = statusMessage;