self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-07-16 00:14:34 +02:00
Code Issues Releases Activity

Desktop, Cli: Fixes #8788: Work around WebDAV sync issues over ipv6 (#9286)

Browse Source
This commit is contained in:
Henry Heino
2023-11-14 10:47:52 -08:00
committed by GitHub
parent 06ea12adb3
commit 2c0181d097
2 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/lib/utils/processStartFlags.ts
View File

@ -11,6 +11,7 @@ export interface MatchedStartFlags {
isSafeMode?: boolean;
showStackTraces?: boolean;
logLevel?: LogLevel;
allowOverridingDnsResultOrder?: boolean;
devPlugins?: string[];
}
@ -63,6 +64,14 @@ const processStartFlags = async (argv: string[], setDefaults = true) => {
continue;
}
if (arg.startsWith('--dns-result-order=')) {
matched.allowOverridingDnsResultOrder = false;
// Handled by Electron/NodeJS (and indicates we shouldn't override this ourselves).
argv.splice(0, 1);
continue;
}
if (arg === '--debug') {
// Currently only handled by ElectronAppWrapper (isDebugMode property)
argv.splice(0, 1);
@ -168,6 +177,7 @@ const processStartFlags = async (argv: string[], setDefaults = true) => {
if (!matched.logLevel) matched.logLevel = Logger.LEVEL_INFO;
if (!matched.env) matched.env = 'prod';
if (!matched.devPlugins) matched.devPlugins = [];
matched.allowOverridingDnsResultOrder ??= true;
}
return {