28ada6ea8b
* chore: bump chromium in DEPS to 99.0.4819.0
* chore: update patches
* chore: bump chromium in DEPS to 99.0.4824.0
* chore: update patches
* chore: bump chromium in DEPS to 99.0.4827.0
* chore: update patches
* 3352511: PiP: Add inkdrop and pointer cursor to PiP window buttons
https://chromium-review.googlesource.com/c/chromium/src/+/3352511
* 3309164: webhid: Show FIDO devices in the chooser if allowed
https://chromium-review.googlesource.com/c/chromium/src/+/3309164
* 3297868: hid: Add experimental HIDDevice.forget()
https://chromium-review.googlesource.com/c/chromium/src/+/3297868
* 3362491: [Extensions] Move i18n API to //extensions
https://chromium-review.googlesource.com/c/chromium/src/+/3362491
* MCC Refactor step0: Allow embedders to register associated_interface binders with RenderFrameHostImpl::associated_registry_.
https://chromium-review.googlesource.com/c/chromium/src/+/3281481
* 3352616: [Gtk] Remove libgtk from the link-line
https://chromium-review.googlesource.com/c/chromium/src/+/3352616
* 3249211: Clear-Site-Data support for partitioned cookies
https://chromium-review.googlesource.com/c/chromium/src/+/3249211
* [Extensions][COIL] Use [allow|block]list in //extensions/common
https://chromium-review.googlesource.com/c/chromium/src/+/3372668
* Begin ScopedUserPrefUpdate migration to modern base::Value
https://chromium-review.googlesource.com/c/chromium/src/+/3376154
* [Code Health] Refactor PrefService GetDict + GetList to use base::Value
https://chromium-review.googlesource.com/c/chromium/src/+/3343526
* 3354997: [CodeHealth] Remove deprecated SetDictionary method
https://chromium-review.googlesource.com/c/chromium/src/+/3354997
* 3287323: Add LacrosPrefStore for lacros settings
https://chromium-review.googlesource.com/c/chromium/src/+/3287323
* 3365916: [PA] Clean up remaining lazy commit code
https://chromium-review.googlesource.com/c/chromium/src/+/3365916
* [MPArch] Target the external protocol error at the responsible frame.
https://chromium-review.googlesource.com/c/chromium/src/+/3011560
* Pass origin to RegisterNonNetworkSubresourceURLLoaderFactories
https://chromium-review.googlesource.com/c/chromium/src/+/3350608
* Linux: Send OSCrypt raw encryption key to the Network Service
https://chromium-review.googlesource.com/c/chromium/src/+/3320484
* [PlzServiceWorker] Remove remaining references to PlzServiceWorker.
https://chromium-review.googlesource.com/c/chromium/src/+/3359441
* chore: fixup for lint
* 3327621: Fix tablet mode detection for Win 11.
https://chromium-review.googlesource.com/c/chromium/src/+/3327621
* 3342428: ax_mac: move AXTextMarker conversion utils under ui umbrella
https://chromium-review.googlesource.com/c/chromium/src/+/3342428
* 3353974: Mac: Use base::Feature for overlay features
https://chromium-review.googlesource.com/c/chromium/src/+/3353974
* chore: bump chromium in DEPS to 99.0.4828.0
* chore: update patches
* chore: bump chromium in DEPS to 99.0.4837.0
* chore: update patches
* chore: update patches
* 3379142: Drop FALLTHROUGH macro
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3379142
* 3381749: C++17: Allow use of std::map::try_emplace and std::map::insert_or_assign
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3381749
* chore: bump chromium in DEPS to 99.0.4839.0
* chore: update patches
* chore: bump chromium in DEPS to 99.0.4840.0
* chore: bump chromium in DEPS to 99.0.4844.0
* 3395881: [api] Deprecate Local<v8::Context> v8::Object::CreationContext()
Ref: https://chromium-review.googlesource.com/c/v8/v8/+/3395881
* chore: update patches
* chore: bump chromium in DEPS to 100.0.4845.0
* chore: update patches
* chore: bump chromium in DEPS to 100.0.4847.0
* chore: update patches
* chore: bump chromium in DEPS to 100.0.4849.0
* chore: update patches
* chore: bump chromium in DEPS to 100.0.4851.0
* chore: bump chromium in DEPS to 100.0.4853.0
* update patches
* chore: update patches
* update patches
* 3383599: Fonts Access: Remove prototype that uses a font picker.
https://chromium-review.googlesource.com/c/chromium/src/+/3383599
* 3404768: Remove ALLOW_UNUSED macros
https://chromium-review.googlesource.com/c/chromium/src/+/3404768
* 3374762: Remove ignore_result.h
https://chromium-review.googlesource.com/c/chromium/src/+/3374762
* 3399305: [unseasoned-pdf] Apply proper frame offsets for touch selections
https://chromium-review.googlesource.com/c/chromium/src/+/3399305
* 3402210: [Extensions] Don't trigger unload event for already unloaded extension
https://chromium-review.googlesource.com/c/chromium/src/+/3402210
* 3410912: Combine URLLoaderClient OnReceiveResponse and OnStartLoadingResponseBody.
https://chromium-review.googlesource.com/c/chromium/src/+/3410912
* 3370428: Make the AuthSchemes policy support dynamic refresh
https://chromium-review.googlesource.com/c/chromium/src/+/3370428
* 3407603: Finish ScopedUserPrefUpdate migration to modern base::Value
https://chromium-review.googlesource.com/c/chromium/src/+/3407603
* 3378352: ozone/x11: move code from //ui/p/x11 to //ui/ozone/p/x11
https://chromium-review.googlesource.com/c/chromium/src/+/3378352
* 3370810: Delete chrome/service, AKA the Cloud Print service process.
https://chromium-review.googlesource.com/c/chromium/src/+/3370810
* chore: bump chromium in DEPS to 100.0.4855.0
* chore: update patches
* fixup! 3370810: Delete chrome/service, AKA the Cloud Print service process.
* revert 3348007 to fix windows build
* 3318572: [Code health] Fix gn check errors in //extensions/browser:*
https://chromium-review.googlesource.com/c/chromium/src/+/3318572
* fix printing.patch
* fix iwyu issue
* 3408515: win: Make ShorcutOperation an enum class and modernize names
https://chromium-review.googlesource.com/c/chromium/src/+/3408515
* 3388333: [UIA] Remove dead code accessibility_misc_utils.h/cc
https://chromium-review.googlesource.com/c/chromium/src/+/3388333
* fix windows build? i hope
* patch gn visibility of //ui/ozone/platform/x11
* missing include base/logging.h
* use BUILDFLAG for USE_NSS_CERTS
https://chromium-review.googlesource.com/c/chromium/src/+/3379123
* defined(OS_*) ==> BUILDFLAG(IS_*)
https://bugs.chromium.org/p/chromium/issues/detail?id=1234043
* fixup! 3404768: Remove ALLOW_UNUSED macros
* another attempt to fix windows build
* temporarily disable the custom scheme service worker test
https://github.com/electron/electron/issues/32664
* fix loading mv3 extensions
not sure what cl broke this unfort.
* fixup! 3404768: Remove ALLOW_UNUSED macros
* patch nan
https://chromium-review.googlesource.com/c/v8/v8/+/3395880
* fix node test
* fix nullptr in FindPdfFrame
* patch perfetto to fix build issue on win-ia32
bc44c3c753
* fix build for linux-x64-testing-no-run-as-node
* fix patch
* skip <webview>.capturePage() test
https://github.com/electron/electron/issues/32705
* test: fix failing tests of focus/blur events of WebContents (#32711)
* inherit stdio from app module test child processes
this prevents them from timing out due to full stdout buffers
* test to see if we can get better logs on windows ci
* try again for appveyor log things
* skip contentTracing tests on ia32
* ci: disable gpu compositing
* drop applied patch
* fix merge fail
* Revert "ci: disable gpu compositing"
This reverts commit 0344129fcb19ea3e87e06c1110d751f22eba3fec.
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: John Kleinschmidt <jkleinsc@github.com>
Co-authored-by: VerteDinde <khammond@slack-corp.com>
Co-authored-by: VerteDinde <vertedinde@electronjs.org>
Co-authored-by: Jeremy Rose <jeremya@chromium.org>
Co-authored-by: Jeremy Rose <nornagon@nornagon.net>
Co-authored-by: Cheng Zhao <zcbenz@gmail.com>
Co-authored-by: deepak1556 <hop2deep@gmail.com>
150 lines
5.4 KiB
C++
150 lines
5.4 KiB
C++
// Copyright (c) 2021 Slack Technologies, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include "shell/common/logging.h"
|
|
|
|
#include <string>
|
|
|
|
#include "base/base_switches.h"
|
|
#include "base/command_line.h"
|
|
#include "base/environment.h"
|
|
#include "base/files/file_path.h"
|
|
#include "base/logging.h"
|
|
#include "base/path_service.h"
|
|
#include "base/strings/string_number_conversions.h"
|
|
#include "chrome/common/chrome_paths.h"
|
|
#include "content/public/common/content_switches.h"
|
|
#include "shell/common/electron_paths.h"
|
|
|
|
namespace logging {
|
|
|
|
constexpr base::StringPiece kLogFileName("ELECTRON_LOG_FILE");
|
|
constexpr base::StringPiece kElectronEnableLogging("ELECTRON_ENABLE_LOGGING");
|
|
|
|
base::FilePath GetLogFileName(const base::CommandLine& command_line) {
|
|
std::string filename = command_line.GetSwitchValueASCII(switches::kLogFile);
|
|
if (filename.empty())
|
|
base::Environment::Create()->GetVar(kLogFileName, &filename);
|
|
if (!filename.empty())
|
|
return base::FilePath::FromUTF8Unsafe(filename);
|
|
|
|
const base::FilePath log_filename(FILE_PATH_LITERAL("electron_debug.log"));
|
|
base::FilePath log_path;
|
|
|
|
if (base::PathService::Get(chrome::DIR_LOGS, &log_path)) {
|
|
log_path = log_path.Append(log_filename);
|
|
return log_path;
|
|
} else {
|
|
// error with path service, just use some default file somewhere
|
|
return log_filename;
|
|
}
|
|
}
|
|
|
|
bool HasExplicitLogFile(const base::CommandLine& command_line) {
|
|
std::string filename = command_line.GetSwitchValueASCII(switches::kLogFile);
|
|
if (filename.empty())
|
|
base::Environment::Create()->GetVar(kLogFileName, &filename);
|
|
return !filename.empty();
|
|
}
|
|
|
|
LoggingDestination DetermineLoggingDestination(
|
|
const base::CommandLine& command_line,
|
|
bool is_preinit) {
|
|
bool enable_logging = false;
|
|
std::string logging_destination;
|
|
if (command_line.HasSwitch(::switches::kEnableLogging)) {
|
|
enable_logging = true;
|
|
logging_destination =
|
|
command_line.GetSwitchValueASCII(switches::kEnableLogging);
|
|
} else {
|
|
auto env = base::Environment::Create();
|
|
if (env->HasVar(kElectronEnableLogging)) {
|
|
enable_logging = true;
|
|
env->GetVar(kElectronEnableLogging, &logging_destination);
|
|
}
|
|
}
|
|
if (!enable_logging)
|
|
return LOG_NONE;
|
|
|
|
bool also_log_to_stderr = false;
|
|
#if !defined(NDEBUG)
|
|
std::string also_log_to_stderr_str;
|
|
if (base::Environment::Create()->GetVar("ELECTRON_ALSO_LOG_TO_STDERR",
|
|
&also_log_to_stderr_str) &&
|
|
!also_log_to_stderr_str.empty())
|
|
also_log_to_stderr = true;
|
|
#endif
|
|
|
|
// --enable-logging logs to stderr, --enable-logging=file logs to a file.
|
|
// NB. this differs from Chromium, in which --enable-logging logs to a file
|
|
// and --enable-logging=stderr logs to stderr, because that's how Electron
|
|
// used to work, so in order to not break anyone who was depending on
|
|
// --enable-logging logging to stderr, we preserve the old behavior by
|
|
// default.
|
|
// If --log-file or ELECTRON_LOG_FILE is specified along with
|
|
// --enable-logging, return LOG_TO_FILE.
|
|
// If we're in the pre-init phase, before JS has run, we want to avoid
|
|
// logging to the default log file, which is inside the user data directory,
|
|
// because we aren't able to accurately determine the user data directory
|
|
// before JS runs. Instead, log to stderr unless there's an explicit filename
|
|
// given.
|
|
if (HasExplicitLogFile(command_line) ||
|
|
(logging_destination == "file" && !is_preinit))
|
|
return LOG_TO_FILE | (also_log_to_stderr ? LOG_TO_STDERR : 0);
|
|
return LOG_TO_SYSTEM_DEBUG_LOG | LOG_TO_STDERR;
|
|
}
|
|
|
|
void InitElectronLogging(const base::CommandLine& command_line,
|
|
bool is_preinit) {
|
|
const std::string process_type =
|
|
command_line.GetSwitchValueASCII(::switches::kProcessType);
|
|
LoggingDestination logging_dest =
|
|
DetermineLoggingDestination(command_line, is_preinit);
|
|
LogLockingState log_locking_state = LOCK_LOG_FILE;
|
|
base::FilePath log_path;
|
|
|
|
if (command_line.HasSwitch(::switches::kLoggingLevel) &&
|
|
GetMinLogLevel() >= 0) {
|
|
std::string log_level =
|
|
command_line.GetSwitchValueASCII(::switches::kLoggingLevel);
|
|
int level = 0;
|
|
if (base::StringToInt(log_level, &level) && level >= 0 &&
|
|
level < LOGGING_NUM_SEVERITIES) {
|
|
SetMinLogLevel(level);
|
|
} else {
|
|
DLOG(WARNING) << "Bad log level: " << log_level;
|
|
}
|
|
}
|
|
|
|
// Don't resolve the log path unless we need to. Otherwise we leave an open
|
|
// ALPC handle after sandbox lockdown on Windows.
|
|
if ((logging_dest & LOG_TO_FILE) != 0) {
|
|
log_path = GetLogFileName(command_line);
|
|
} else {
|
|
log_locking_state = DONT_LOCK_LOG_FILE;
|
|
}
|
|
|
|
// On Windows, having non canonical forward slashes in log file name causes
|
|
// problems with sandbox filters, see https://crbug.com/859676
|
|
log_path = log_path.NormalizePathSeparators();
|
|
|
|
LoggingSettings settings;
|
|
settings.logging_dest = logging_dest;
|
|
settings.log_file_path = log_path.value().c_str();
|
|
settings.lock_log = log_locking_state;
|
|
// If we're logging to an explicit file passed with --log-file, we don't want
|
|
// to delete the log file on our second initialization.
|
|
settings.delete_old =
|
|
process_type.empty() && (is_preinit || !HasExplicitLogFile(command_line))
|
|
? DELETE_OLD_LOG_FILE
|
|
: APPEND_TO_OLD_LOG_FILE;
|
|
bool success = InitLogging(settings);
|
|
if (!success) {
|
|
PLOG(FATAL) << "Failed to init logging";
|
|
}
|
|
|
|
SetLogItems(true /* pid */, false, true /* timestamp */, false);
|
|
}
|
|
|
|
} // namespace logging
|