diff --git a/src/Logging.cpp b/src/Logging.cpp
index 67bcaf7a..a18a1cee 100644
--- a/src/Logging.cpp
+++ b/src/Logging.cpp
@@ -25,35 +25,35 @@ constexpr auto MAX_LOG_FILES = 3;
void
qmlMessageHandler(QtMsgType type, const QMessageLogContext &context, const QString &msg)
{
- std::string localMsg = msg.toStdString();
- const char *file = context.file ? context.file : "";
- const char *function = context.function ? context.function : "";
-
- if (
- // The default style has the point size set. If you use pixel size anywhere, you get
- // that warning, which is useless, since sometimes you need the pixel size to match the
- // text to the size of the outer element for example. This is done in the avatar and
- // without that you get one warning for every Avatar displayed, which is stupid!
- msg.endsWith(QStringLiteral("Both point size and pixel size set. Using pixel size.")))
- return;
-
- switch (type) {
- case QtDebugMsg:
- nhlog::qml()->debug("{} ({}:{}, {})", localMsg, file, context.line, function);
- break;
- case QtInfoMsg:
- nhlog::qml()->info("{} ({}:{}, {})", localMsg, file, context.line, function);
- break;
- case QtWarningMsg:
- nhlog::qml()->warn("{} ({}:{}, {})", localMsg, file, context.line, function);
- break;
- case QtCriticalMsg:
- nhlog::qml()->critical("{} ({}:{}, {})", localMsg, file, context.line, function);
- break;
- case QtFatalMsg:
- nhlog::qml()->critical("{} ({}:{}, {})", localMsg, file, context.line, function);
- break;
- }
+ std::string localMsg = msg.toStdString();
+ const char *file = context.file ? context.file : "";
+ const char *function = context.function ? context.function : "";
+
+ if (
+ // The default style has the point size set. If you use pixel size anywhere, you get
+ // that warning, which is useless, since sometimes you need the pixel size to match the
+ // text to the size of the outer element for example. This is done in the avatar and
+ // without that you get one warning for every Avatar displayed, which is stupid!
+ msg.endsWith(QStringLiteral("Both point size and pixel size set. Using pixel size.")))
+ return;
+
+ switch (type) {
+ case QtDebugMsg:
+ nhlog::qml()->debug("{} ({}:{}, {})", localMsg, file, context.line, function);
+ break;
+ case QtInfoMsg:
+ nhlog::qml()->info("{} ({}:{}, {})", localMsg, file, context.line, function);
+ break;
+ case QtWarningMsg:
+ nhlog::qml()->warn("{} ({}:{}, {})", localMsg, file, context.line, function);
+ break;
+ case QtCriticalMsg:
+ nhlog::qml()->critical("{} ({}:{}, {})", localMsg, file, context.line, function);
+ break;
+ case QtFatalMsg:
+ nhlog::qml()->critical("{} ({}:{}, {})", localMsg, file, context.line, function);
+ break;
+ }
}
}
@@ -63,60 +63,59 @@ bool enable_debug_log_from_commandline = false;
void
init(const std::string &file_path)
{
- auto file_sink = std::make_shared<spdlog::sinks::rotating_file_sink_mt>(
- file_path, MAX_FILE_SIZE, MAX_LOG_FILES);
-
- auto console_sink = std::make_shared<spdlog::sinks::stdout_color_sink_mt>();
-
- std::vector<spdlog::sink_ptr> sinks;
- sinks.push_back(file_sink);
- sinks.push_back(console_sink);
-
- net_logger = std::make_shared<spdlog::logger>("net", std::begin(sinks), std::end(sinks));
- ui_logger = std::make_shared<spdlog::logger>("ui", std::begin(sinks), std::end(sinks));
- db_logger = std::make_shared<spdlog::logger>("db", std::begin(sinks), std::end(sinks));
- crypto_logger =
- std::make_shared<spdlog::logger>("crypto", std::begin(sinks), std::end(sinks));
- qml_logger = std::make_shared<spdlog::logger>("qml", std::begin(sinks), std::end(sinks));
-
- if (nheko::enable_debug_log || enable_debug_log_from_commandline) {
- db_logger->set_level(spdlog::level::trace);
- ui_logger->set_level(spdlog::level::trace);
- crypto_logger->set_level(spdlog::level::trace);
- net_logger->set_level(spdlog::level::trace);
- qml_logger->set_level(spdlog::level::trace);
- }
-
- qInstallMessageHandler(qmlMessageHandler);
+ auto file_sink = std::make_shared<spdlog::sinks::rotating_file_sink_mt>(
+ file_path, MAX_FILE_SIZE, MAX_LOG_FILES);
+
+ auto console_sink = std::make_shared<spdlog::sinks::stdout_color_sink_mt>();
+
+ std::vector<spdlog::sink_ptr> sinks;
+ sinks.push_back(file_sink);
+ sinks.push_back(console_sink);
+
+ net_logger = std::make_shared<spdlog::logger>("net", std::begin(sinks), std::end(sinks));
+ ui_logger = std::make_shared<spdlog::logger>("ui", std::begin(sinks), std::end(sinks));
+ db_logger = std::make_shared<spdlog::logger>("db", std::begin(sinks), std::end(sinks));
+ crypto_logger = std::make_shared<spdlog::logger>("crypto", std::begin(sinks), std::end(sinks));
+ qml_logger = std::make_shared<spdlog::logger>("qml", std::begin(sinks), std::end(sinks));
+
+ if (nheko::enable_debug_log || enable_debug_log_from_commandline) {
+ db_logger->set_level(spdlog::level::trace);
+ ui_logger->set_level(spdlog::level::trace);
+ crypto_logger->set_level(spdlog::level::trace);
+ net_logger->set_level(spdlog::level::trace);
+ qml_logger->set_level(spdlog::level::trace);
+ }
+
+ qInstallMessageHandler(qmlMessageHandler);
}
std::shared_ptr<spdlog::logger>
ui()
{
- return ui_logger;
+ return ui_logger;
}
std::shared_ptr<spdlog::logger>
net()
{
- return net_logger;
+ return net_logger;
}
std::shared_ptr<spdlog::logger>
db()
{
- return db_logger;
+ return db_logger;
}
std::shared_ptr<spdlog::logger>
crypto()
{
- return crypto_logger;
+ return crypto_logger;
}
std::shared_ptr<spdlog::logger>
qml()
{
- return qml_logger;
+ return qml_logger;
}
}
|
