Updated the logging system
This commit is contained in:
@@ -1,5 +1,7 @@
|
||||
#include <memory>
|
||||
|
||||
#include <spdlog/sinks/rotating_file_sink.h>
|
||||
|
||||
#include <iostream>
|
||||
#include <bitset>
|
||||
#include <algorithm>
|
||||
@@ -475,7 +477,8 @@ CommandResult ConnectedClient::handleCommandServerEdit(Command &cmd) {
|
||||
serverInstance->getWebList()->enable_report(target_server);
|
||||
else
|
||||
serverInstance->getWebList()->disable_report(target_server);
|
||||
debugMessage(string() + "Changed weblist state to -> " + (cmd["virtualserver_weblist_enabled"].as<bool>() ? "activated" : "disabled"));
|
||||
debugMessage(target_server->getServerId(), "Changed weblist state to -> {}",
|
||||
cmd["virtualserver_weblist_enabled"].as<bool>() ? "activated" : "disabled");
|
||||
}
|
||||
} SERVEREDIT_CHK_PROP_CACHED("virtualserver_needed_identity_security_level", permission::b_virtualserver_modify_needed_identity_security_level, int) }
|
||||
|
||||
@@ -3812,7 +3815,7 @@ CommandResult ConnectedClient::handleCommandFTDeleteFile(Command &cmd) {
|
||||
for (const auto &file : files) {
|
||||
if (!file) continue;
|
||||
if (!serverInstance->getFileServer()->deleteFile(file)) {
|
||||
logCritical(this->getServerId(), lstream << "Cound not delete file " << file->path << "/" << file->name);
|
||||
logCritical(this->getServerId(), "Could not delete file {}/{}", file->path, file->name);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -7370,8 +7373,12 @@ CommandResult ConnectedClient::handleCommandLogView(ts::Command& cmd) {
|
||||
PERM_CHECKR(permission::b_virtualserver_log_view, 1, true);
|
||||
|
||||
for(const auto& sink : logger::logger(target_server)->sinks()) {
|
||||
if(dynamic_pointer_cast<logger::ColoredFileSink>(sink)) {
|
||||
log_path = dynamic_pointer_cast<logger::ColoredFileSink>(sink)->_file_helper.filename();
|
||||
if(dynamic_pointer_cast<spdlog::sinks::rotating_file_sink_mt>(sink)) {
|
||||
log_path = dynamic_pointer_cast<spdlog::sinks::rotating_file_sink_mt>(sink)->filename();
|
||||
break;
|
||||
} else if(dynamic_pointer_cast<spdlog::sinks::rotating_file_sink_st>(sink)) {
|
||||
log_path = dynamic_pointer_cast<spdlog::sinks::rotating_file_sink_st>(sink)->filename();
|
||||
break;
|
||||
}
|
||||
}
|
||||
if(log_path.empty())
|
||||
|
||||
Reference in New Issue
Block a user