mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

fix: allow blocking IO for setAppLogsPath to avoid DCHECK (#23111)

Browse source 
* fix: let setAppLogsPath write to disk on UI thread

Otherwise, the DCHECK in thread_restrictions will fire.

* scope the io allowance more tightly

* oops, scope it tightly in the mac version too
This commit is contained in:
loc 2020-04-21 12:28:01 -07:00 committed by GitHub
parent 07654c47ec
commit cd0dda0125
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
shell/browser/api/electron_api_app.cc
View file

@ -851,13 +851,19 @@ void App::SetAppLogsPath(gin_helper::ErrorThrower thrower,
thrower.ThrowError("Path must be absolute"); thrower.ThrowError("Path must be absolute");
return; return;
} }
base::PathService::Override(DIR_APP_LOGS, custom_path.value()); {
base::ThreadRestrictions::ScopedAllowIO allow_io;
base::PathService::Override(DIR_APP_LOGS, custom_path.value());
}
} else { } else {
base::FilePath path; base::FilePath path;
if (base::PathService::Get(DIR_USER_DATA, &path)) { if (base::PathService::Get(DIR_USER_DATA, &path)) {
path = path.Append(base::FilePath::FromUTF8Unsafe(GetApplicationName())); path = path.Append(base::FilePath::FromUTF8Unsafe(GetApplicationName()));
path = path.Append(base::FilePath::FromUTF8Unsafe("logs")); path = path.Append(base::FilePath::FromUTF8Unsafe("logs"));
base::PathService::Override(DIR_APP_LOGS, path); {
base::ThreadRestrictions::ScopedAllowIO allow_io;
base::PathService::Override(DIR_APP_LOGS, path);
}
} }
} }
} }
@ -874,7 +880,6 @@ base::FilePath App::GetPath(gin_helper::ErrorThrower thrower,
// If users try to get the logs path before setting a logs path, // If users try to get the logs path before setting a logs path,
// set the path to a sensible default and then try to get it again // set the path to a sensible default and then try to get it again
if (!succeed && name == "logs") { if (!succeed && name == "logs") {
base::ThreadRestrictions::ScopedAllowIO allow_io;
SetAppLogsPath(thrower, base::Optional<base::FilePath>()); SetAppLogsPath(thrower, base::Optional<base::FilePath>());
succeed = base::PathService::Get(key, &path); succeed = base::PathService::Get(key, &path);
} }

12
shell/browser/api/electron_api_app_mac.mm
View file

@ -21,7 +21,10 @@ void App::SetAppLogsPath(gin_helper::ErrorThrower thrower,
thrower.ThrowError("Path must be absolute"); thrower.ThrowError("Path must be absolute");
return; return;
} }
base::PathService::Override(DIR_APP_LOGS, custom_path.value()); {
base::ThreadRestrictions::ScopedAllowIO allow_io;
base::PathService::Override(DIR_APP_LOGS, custom_path.value());
}
} else { } else {
NSString* bundle_name = NSString* bundle_name =
[[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleName"]; [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleName"];
@ -29,8 +32,11 @@ void App::SetAppLogsPath(gin_helper::ErrorThrower thrower,
[NSString stringWithFormat:@"Library/Logs/%@", bundle_name]; [NSString stringWithFormat:@"Library/Logs/%@", bundle_name];
NSString* library_path = NSString* library_path =
[NSHomeDirectory() stringByAppendingPathComponent:logs_path]; [NSHomeDirectory() stringByAppendingPathComponent:logs_path];
base::PathService::Override(DIR_APP_LOGS, {
base::FilePath([library_path UTF8String])); base::ThreadRestrictions::ScopedAllowIO allow_io;
base::PathService::Override(DIR_APP_LOGS,
base::FilePath([library_path UTF8String]));
}
} }
} }