diff options
| author | danmosemsft <danmose@microsoft.com> | 2017-02-11 07:20:12 -0800 |
|---|---|---|
| committer | danmosemsft <danmose@microsoft.com> | 2017-02-11 07:20:12 -0800 |
| commit | 56d4ba8a9338c3ff7378d18378f38ad847f130f2 (patch) | |
| tree | 40b9463880286b1bc0b4c3f858680f1ff210c933 /src/vm/eventreporter.cpp | |
| parent | 8be2f9bb0039e2c49f59c4fb66cebf5467485ba2 (diff) | |
| download | coreclr-56d4ba8a9338c3ff7378d18378f38ad847f130f2.tar.gz coreclr-56d4ba8a9338c3ff7378d18378f38ad847f130f2.tar.bz2 coreclr-56d4ba8a9338c3ff7378d18378f38ad847f130f2.zip | |
Revert "Remove always defined FEATURE_CORESYSTEM"
This reverts commit 751771a8976f909af772e35c167bd7e3ffbe44c8.
Diffstat (limited to 'src/vm/eventreporter.cpp')
| -rw-r--r-- | src/vm/eventreporter.cpp | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/src/vm/eventreporter.cpp b/src/vm/eventreporter.cpp index e10aed9441..a96c525439 100644 --- a/src/vm/eventreporter.cpp +++ b/src/vm/eventreporter.cpp @@ -448,8 +448,33 @@ BOOL ShouldLogInEventLog() } CONTRACTL_END; +#ifndef FEATURE_CORESYSTEM + // If the process is being debugged, don't log + if ((CORDebuggerAttached() || IsDebuggerPresent()) +#ifdef _DEBUG + // Allow debug to be able to break in + && + CLRConfig::GetConfigValue(CLRConfig::INTERNAL_BreakOnUncaughtException) == 0 +#endif + ) + { + return FALSE; + } + + static LONG fOnce = 0; + if (fOnce == 1 || FastInterlockExchange(&fOnce, 1) == 1) + { + return FALSE; + } + + if (CLRConfig::GetConfigValue(CLRConfig::EXTERNAL_logFatalError) == 0) + return FALSE; + else + return TRUE; +#else // no event log on Apollo return FALSE; +#endif //!FEATURE_CORESYSTEM } //--------------------------------------------------------------------------------------- |