|
@@ -6,7 +6,7 @@
|
|
|
|
|
|
|
|
|
#include <string>
|
|
|
-#include <filesystem>
|
|
|
+#include <QApplication>
|
|
|
|
|
|
|
|
|
|
|
@@ -18,58 +18,63 @@
|
|
|
void initLog(QString ModuleName, CLHQLogApi& lhQLog)
|
|
|
{
|
|
|
|
|
|
- try {
|
|
|
-
|
|
|
- auto sink_consolse = std::make_shared<spdlog::sinks::stdout_color_sink_mt>();
|
|
|
+ try
|
|
|
+ {
|
|
|
|
|
|
|
|
|
|
|
|
- std::filesystem::path execPath = std::filesystem::current_path();
|
|
|
+
|
|
|
+ std::string execPath = QApplication::applicationDirPath().toStdString();
|
|
|
#if defined(Q_OS_WIN32)
|
|
|
#if C_DEBUG
|
|
|
- std::string libName = execPath.string() + "/LHQLogd.dll";
|
|
|
+ std::string libName = execPath + "/LHQLogd.dll";
|
|
|
#elif C_RELEASE
|
|
|
- std::string libName = execPath.string() + "/LHQLog.dll";
|
|
|
+ std::string libName = execPath + "/LHQLog.dll";
|
|
|
#endif
|
|
|
#elif defined(Q_OS_LINUX)
|
|
|
- std::string libName = execPath.string() + "/libLHQLog.so";
|
|
|
+ std::string libName = execPath + "/libLHQLog.so";
|
|
|
#endif
|
|
|
- auto sink_custom = std::make_shared<spdlog::sinks::LHLog_file_sink_mt>(&lhQLog, QString(libName.c_str()), ModuleName);
|
|
|
+
|
|
|
|
|
|
auto sink_default = std::make_shared<spdlog::sinks::stdout_color_sink_mt>();
|
|
|
+
|
|
|
+ auto sink_consolse = std::make_shared<spdlog::sinks::stdout_color_sink_mt>();
|
|
|
+
|
|
|
+ auto sink_LHLog = std::make_shared<spdlog::sinks::LHLog_file_sink_mt>(&lhQLog, QString(libName.c_str()), ModuleName);
|
|
|
|
|
|
|
|
|
- sink_consolse->set_pattern("%^[%Y-%m-%d %H:%M:%S] [%l] [%n] [%s %#] %v %$");
|
|
|
-
|
|
|
- sink_custom->set_pattern("%v");
|
|
|
- sink_default->set_pattern("%^[%Y-%m-%d %H:%M:%S] [%l] [%s %#] %v %$");
|
|
|
+ #if C_DEBUG
|
|
|
+ sink_consolse->set_pattern("%^[%Y-%m-%d %H:%M:%S:%e] [%l] [%n] [%s %#] %v %$");
|
|
|
+
|
|
|
+ sink_LHLog->set_pattern("%v");
|
|
|
+ sink_default->set_pattern("%^[%Y-%m-%d %H:%M:%S:%e:%e] [%l] [%s %#] %v %$");
|
|
|
+ #elif C_RELEASE
|
|
|
+ sink_consolse->set_pattern("%^[%Y-%m-%d %H:%M:%S:%e] [%l] [%n] %v %$");
|
|
|
+
|
|
|
+ sink_LHLog->set_pattern("%v");
|
|
|
+ sink_default->set_pattern("%^[%Y-%m-%d %H:%M:%S:%e] [%l] %v %$");
|
|
|
+ #endif
|
|
|
|
|
|
|
|
|
std::vector<spdlog::sink_ptr> sinks;
|
|
|
sinks.push_back(sink_consolse);
|
|
|
|
|
|
- sinks.push_back(sink_custom);
|
|
|
+ sinks.push_back(sink_LHLog);
|
|
|
|
|
|
|
|
|
spdlog::default_logger()->sinks().clear();
|
|
|
spdlog::default_logger()->sinks().push_back(sink_default);
|
|
|
- spdlog::default_logger()->sinks().push_back(sink_custom);
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
+ spdlog::default_logger()->sinks().push_back(sink_LHLog);
|
|
|
+
|
|
|
|
|
|
auto logger_main = std::make_shared<spdlog::logger>("main",begin(sinks),end(sinks));
|
|
|
|
|
|
auto logger_WebAPI = std::make_shared<spdlog::logger>("WebAPI",begin(sinks),end(sinks));
|
|
|
-
|
|
|
- auto logger_SuperBrain = std::make_shared<spdlog::logger>("SuperBrain",begin(sinks),end(sinks));
|
|
|
+
|
|
|
|
|
|
|
|
|
spdlog::register_logger(logger_main);
|
|
|
spdlog::register_logger(logger_WebAPI);
|
|
|
- spdlog::register_logger(logger_SuperBrain);
|
|
|
|
|
|
|
|
|
* 这是默认的设置,可以在外面单数设置输出方式
|
|
@@ -81,8 +86,8 @@ void initLog(QString ModuleName, CLHQLogApi& lhQLog)
|
|
|
#elif defined(C_RELEASE)
|
|
|
spdlog::set_level(spdlog::level::info);
|
|
|
spdlog::flush_on(spdlog::level::info);
|
|
|
- sink_consolse->set_level(spdlog::level::off);
|
|
|
- sink_default->set_level(spdlog::level::off);
|
|
|
+ sink_consolse->set_level(spdlog::level::info);
|
|
|
+ sink_default->set_level(spdlog::level::info);
|
|
|
#endif
|
|
|
|
|
|
|