self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-11-06 09:19:22 +02:00
Code Issues Releases Activity

Merge remote-tracking branch 'origin/release-3.0' into dev

Browse Source
This commit is contained in:
Henry Heino
2024-08-15 08:34:56 -07:00
parent 7e599c3a3e a6cf0a3a81
commit 72472623cc
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/lib/shim-init-node.ts
View File

@@ -590,6 +590,7 @@ function shimInit(options: ShimInitOptions = null) {
cleanUpOnError(error);
});
const requestStart = new Date();
// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
const request = http.request(requestOptions, (response: any) => {
@@ -629,7 +630,10 @@ function shimInit(options: ShimInitOptions = null) {
});
request.on('timeout', () => {
request.destroy(new Error(`Request timed out. Timeout value: ${requestOptions.timeout}ms.`));
// We choose to not destroy the request when a timeout value is not specified to keep
// the behavior we had before the addition of this event handler.
if (!requestOptions.timeout) return;
request.destroy(new Error(`Request timed out. Timeout value: ${requestOptions.timeout}ms. Actual connection time: ${new Date().getTime() - requestStart.getTime()}ms`));
});
// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied