YangWX/crossdesk
1
0
Fork 0
mirror of https://github.com/kunkundi/crossdesk.git synced 2025-10-26 20:25:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

[fix] fix log name conflict

Browse Source
This commit is contained in:
dijunkun
2025-01-22 17:34:35 +08:00
parent 9bb560314b
commit 4df935b9d2
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/log/rd_log.cpp
View File

@@ -1,7 +1,7 @@
#include "rd_log.h" #include "rd_log.h"
std::shared_ptr<spdlog::logger> get_logger() { std::shared_ptr<spdlog::logger> get_rd_logger() {
if (auto logger = spdlog::get(LOGGER_NAME)) { if (auto logger = spdlog::get(RD_LOGGER_NAME)) {
return logger; return logger;
} }
@@ -18,7 +18,7 @@ std::shared_ptr<spdlog::logger> get_logger() {
std::stringstream ss; std::stringstream ss;
std::string filename; std::string filename;
ss << LOGGER_NAME; ss << RD_LOGGER_NAME;
ss << std::put_time(&tm_info, "-%Y%m%d-%H%M%S.log"); ss << std::put_time(&tm_info, "-%Y%m%d-%H%M%S.log");
ss >> filename; ss >> filename;
@@ -28,8 +28,8 @@ std::shared_ptr<spdlog::logger> get_logger() {
sinks.push_back(std::make_shared<spdlog::sinks::rotating_file_sink_mt>( sinks.push_back(std::make_shared<spdlog::sinks::rotating_file_sink_mt>(
path, 1048576 * 5, 3)); path, 1048576 * 5, 3));
auto combined_logger = auto combined_logger = std::make_shared<spdlog::logger>(
std::make_shared<spdlog::logger>(LOGGER_NAME, begin(sinks), end(sinks)); RD_LOGGER_NAME, begin(sinks), end(sinks));
combined_logger->flush_on(spdlog::level::info); combined_logger->flush_on(spdlog::level::info);
spdlog::register_logger(combined_logger); spdlog::register_logger(combined_logger);

12
src/log/rd_log.h
View File

@@ -24,16 +24,16 @@ using namespace std::chrono;
#define SPDLOG_ACTIVE_LEVEL SPDLOG_LEVEL_INFO #define SPDLOG_ACTIVE_LEVEL SPDLOG_LEVEL_INFO
constexpr auto LOGGER_NAME = "rd"; constexpr auto RD_LOGGER_NAME = "rd";
std::shared_ptr<spdlog::logger> get_logger(); std::shared_ptr<spdlog::logger> get_rd_logger();
#define LOG_INFO(...) SPDLOG_LOGGER_INFO(get_logger(), __VA_ARGS__); #define LOG_INFO(...) SPDLOG_LOGGER_INFO(get_rd_logger(), __VA_ARGS__);
#define LOG_WARN(...) SPDLOG_LOGGER_WARN(get_logger(), __VA_ARGS__); #define LOG_WARN(...) SPDLOG_LOGGER_WARN(get_rd_logger(), __VA_ARGS__);
#define LOG_ERROR(...) SPDLOG_LOGGER_ERROR(get_logger(), __VA_ARGS__); #define LOG_ERROR(...) SPDLOG_LOGGER_ERROR(get_rd_logger(), __VA_ARGS__);
#define LOG_FATAL(...) SPDLOG_LOGGER_CRITICAL(get_logger(), __VA_ARGS__); #define LOG_FATAL(...) SPDLOG_LOGGER_CRITICAL(get_rd_logger(), __VA_ARGS__);
#endif #endif

2
src/single_window/render_callback_func.cpp
View File

@@ -115,7 +115,7 @@ void Render::OnReceiveVideoBufferCb(const XVideoFrame *video_frame,
event.user.type = STREAM_FRASH; event.user.type = STREAM_FRASH;
event.user.data1 = props; event.user.data1 = props;
SDL_PushEvent(&event); SDL_PushEvent(&event);
LOG_ERROR("STREAM_FRASH");
props->streaming_ = true; props->streaming_ = true;
} }
} }

2
thirdparty/projectx vendored

Submodule thirdparty/projectx updated: 2512e1eb15...cd349cd98d