Check IsDebuggerPresent in msvc_sink before doing work. Fix #2408
This commit is contained in:
parent
4accce5d7b
commit
bd5a81df70
@ -1,8 +1,9 @@
|
|||||||
// Copyright(c) 2016 Alexander Dalshov.
|
// Copyright(c) 2016 Alexander Dalshov & spdlog contributors.
|
||||||
// Distributed under the MIT License (http://opensource.org/licenses/MIT)
|
// Distributed under the MIT License (http://opensource.org/licenses/MIT)
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
|
|
||||||
#if defined(_WIN32)
|
#if defined(_WIN32)
|
||||||
|
|
||||||
# include <spdlog/details/null_mutex.h>
|
# include <spdlog/details/null_mutex.h>
|
||||||
@ -13,6 +14,7 @@
|
|||||||
|
|
||||||
// Avoid including windows.h (https://stackoverflow.com/a/30741042)
|
// Avoid including windows.h (https://stackoverflow.com/a/30741042)
|
||||||
extern "C" __declspec(dllimport) void __stdcall OutputDebugStringA(const char *lpOutputString);
|
extern "C" __declspec(dllimport) void __stdcall OutputDebugStringA(const char *lpOutputString);
|
||||||
|
extern "C" __declspec(dllimport) int __stdcall IsDebuggerPresent();
|
||||||
|
|
||||||
namespace spdlog {
|
namespace spdlog {
|
||||||
namespace sinks {
|
namespace sinks {
|
||||||
@ -24,10 +26,16 @@ class msvc_sink : public base_sink<Mutex>
|
|||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
msvc_sink() = default;
|
msvc_sink() = default;
|
||||||
|
msvc_sink(bool check_ebugger_present)
|
||||||
|
: check_debbugger_present_{check_ebugger_present} {};
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
void sink_it_(const details::log_msg &msg) override
|
void sink_it_(const details::log_msg &msg) override
|
||||||
{
|
{
|
||||||
|
if (check_debbugger_present_ && !IsDebuggerPresent())
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
memory_buf_t formatted;
|
memory_buf_t formatted;
|
||||||
base_sink<Mutex>::formatter_->format(msg, formatted);
|
base_sink<Mutex>::formatter_->format(msg, formatted);
|
||||||
formatted.push_back('\0'); // add a null terminator for OutputDebugStringA
|
formatted.push_back('\0'); // add a null terminator for OutputDebugStringA
|
||||||
@ -35,6 +43,8 @@ protected:
|
|||||||
}
|
}
|
||||||
|
|
||||||
void flush_() override {}
|
void flush_() override {}
|
||||||
|
|
||||||
|
bool check_debbugger_present_ = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
using msvc_sink_mt = msvc_sink<std::mutex>;
|
using msvc_sink_mt = msvc_sink<std::mutex>;
|
||||||
|
Loading…
Reference in New Issue
Block a user