shadps4-emu/shadps4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2026-07-18 03:51:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Common: Restore old log filter behavior (#4336)

Browse Source 
* Restore old log filter behavior

Not sure exactly why this hadn't happened yet.

* Suggested change

* Update documentation to include changes

* Remove mention of debug log class

Debug is both a valid class and level, kinda confusing to use it as an example in my opinion.

* Error instead of assert

* Missing include
This commit is contained in:
Stephen Miller
2026-04-30 15:00:21 -05:00
committed by GitHub
parent 5bfec866b1
commit e7d571c8da
2 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/common/logging/log.cpp
View File

@@ -2,6 +2,7 @@
// SPDX-License-Identifier: GPL-2.0-or-later
#include <cstdlib>
#include <iostream>
#include <string>
#include "common/assert.h"
@@ -200,12 +201,17 @@ void Setup(std::string_view log_filename) {
std::unordered_map<std::string, spdlog::level> log_level_per_class;
if (EmulatorSettings.IsLogEnable()) {
for (const auto class_level : std::views::split(EmulatorSettings.GetLogFilter(), ',')) {
for (const auto class_level : std::views::split(EmulatorSettings.GetLogFilter(), ' ')) {
const auto class_level_pair =
std::views::split(class_level, '=') | std::ranges::to<std::vector<std::string>>();
std::views::split(class_level, ':') | std::ranges::to<std::vector<std::string>>();
if (class_level_pair.size() == 1) {
default_log_level = spdlog::level_from_str(class_level_pair.front() |
if (class_level_pair.size() != 2) {
std::cerr << "bad log filter provided" << std::endl;
continue;
}
if (class_level_pair.front()[0] == '*') {
default_log_level = spdlog::level_from_str(class_level_pair.back() |
std::ranges::to<std::string>());
} else {
log_level_per_class[class_level_pair.front() | std::ranges::to<std::string>()] =