Skip to content

Commit db3123c

Browse files
Properly disable logs on Release build
1 parent b9da570 commit db3123c

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

src/logging.cpp

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,18 @@ void logging::SetupLogger() {
1414
/* Set log level */
1515
TCHAR envLogLevel[32767];
1616
GetEnvironmentVariable("SAFEDISCSHIM_LOGLEVEL", envLogLevel, sizeof(envLogLevel));
17-
if ( GetLastError() == ERROR_ENVVAR_NOT_FOUND ) {
17+
if (GetLastError() == ERROR_ENVVAR_NOT_FOUND) {
1818
#ifdef _DEBUG
1919
spdlog::set_level(spdlog::level::trace);
2020
#else
2121
// don't output logs if envvar is not defined
22-
return;
22+
spdlog::set_level(spdlog::level::off);
2323
#endif
2424
}
2525
else spdlog::cfg::helpers::load_levels(envLogLevel);
2626

2727
/* Return early if logs are off, so files are not created */
28-
if ( spdlog::get_level() == spdlog::level::off )
28+
if (spdlog::get_level() == spdlog::level::off)
2929
return;
3030

3131
/* Log to ringbuffer until we can determine log file name later */
@@ -40,12 +40,16 @@ void logging::SetupLogger() {
4040
}
4141

4242
void logging::SetLoggerFileName(const std::string& fileName) {
43+
/* Return early if logs are off, so files are not created */
44+
if (spdlog::get_level() == spdlog::level::off)
45+
return;
46+
4347
try {
4448
const auto logger = spdlog::basic_logger_mt("file",
4549
fileName, true);
4650
spdlog::set_default_logger(logger);
4751
}
48-
catch (const spdlog::spdlog_ex &ex) {
52+
catch (const spdlog::spdlog_ex& ex) {
4953
spdlog::info("Error logging to file ({}), logging to stdout instead.",
5054
ex.what());
5155
}

0 commit comments

Comments
 (0)