добавил обратную сортировку лога
This commit is contained in:
@@ -997,7 +997,7 @@ std::vector<std::string> getLogFilesSorted(const std::string& path) {
|
||||
|
||||
api_driver::obj::TerminalManagerLogs::TerminalManagerLogs(const std::string& path): logsFileDir(path) {}
|
||||
|
||||
std::string api_driver::obj::TerminalManagerLogs::loadPreview() {
|
||||
std::string api_driver::obj::TerminalManagerLogs::loadPreview(bool isReverse) {
|
||||
auto logFiles = getLogFilesSorted(logsFileDir);
|
||||
if (logFiles.empty()) return "No log files found...";
|
||||
|
||||
@@ -1032,15 +1032,23 @@ std::string api_driver::obj::TerminalManagerLogs::loadPreview() {
|
||||
// Собираем результат в правильном порядке
|
||||
std::string result;
|
||||
result.reserve(lines.size() * 100); // Предполагаемая средняя длина строки
|
||||
for (auto it = lines.rbegin(); it != lines.rend(); ++it) {
|
||||
result += *it;
|
||||
result += '\n';
|
||||
if (isReverse) {
|
||||
for (auto line: lines) {
|
||||
result += line;
|
||||
result += '\n';
|
||||
}
|
||||
} else {
|
||||
for (auto it = lines.rbegin(); it != lines.rend(); ++it) {
|
||||
result += *it;
|
||||
result += '\n';
|
||||
}
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
std::string api_driver::obj::TerminalManagerLogs::loadPreviewWithFilter(const std::string& logLevel) {
|
||||
std::string api_driver::obj::TerminalManagerLogs::loadPreviewWithFilter(bool isReverse, const std::string& logLevel) {
|
||||
std::ignore = isReverse;
|
||||
return "Logs level " + logLevel + " filtering not supported yet...";
|
||||
}
|
||||
|
||||
|
@@ -263,9 +263,9 @@ namespace api_driver::obj {
|
||||
|
||||
TerminalManagerLogs(const std::string& path);
|
||||
|
||||
std::string loadPreview();
|
||||
std::string loadPreview(bool isReverse);
|
||||
|
||||
std::string loadPreviewWithFilter(const std::string& logLevel);
|
||||
std::string loadPreviewWithFilter(bool isReverse, const std::string& logLevel);
|
||||
|
||||
void loadFullLog(std::vector<char>& destData);
|
||||
|
||||
|
@@ -683,6 +683,11 @@ public:
|
||||
isPreview = true;
|
||||
}
|
||||
|
||||
bool isReversePreview = false;
|
||||
if (req.url->params.find("reverse") != req.url->params.end()) {
|
||||
isReversePreview = true;
|
||||
}
|
||||
|
||||
std::string logLevelFilter;
|
||||
if (req.url->params.find("level") != req.url->params.end()) {
|
||||
logLevelFilter = req.url->params["level"];
|
||||
@@ -692,7 +697,7 @@ public:
|
||||
rep.headers.push_back({.name = "Content-Type", .value = toString(mime_types::text_plain)});
|
||||
rep.content.clear();
|
||||
if (isPreview) {
|
||||
auto result = logLevelFilter.empty() ? this->api->logs.loadPreview() : this->api->logs.loadPreviewWithFilter(logLevelFilter);
|
||||
auto result = logLevelFilter.empty() ? this->api->logs.loadPreview(isReversePreview) : this->api->logs.loadPreviewWithFilter(isReversePreview, logLevelFilter);
|
||||
rep.content.insert(rep.content.end(), result.c_str(), result.c_str() + result.size());
|
||||
} else {
|
||||
this->api->logs.loadFullLog(rep.content);
|
||||
|
@@ -26,17 +26,19 @@ namespace http::server {
|
||||
}
|
||||
|
||||
static void parseParams(Url& u, const std::string& query) {
|
||||
std::istringstream iss(query);
|
||||
std::string param;
|
||||
while (std::getline(iss, param, '&')) {
|
||||
size_t equal_pos = param.find('=');
|
||||
if (equal_pos != std::string::npos) {
|
||||
const std::string key = param.substr(0, equal_pos);
|
||||
const std::string value = param.substr(equal_pos + 1);
|
||||
u.params[key] = value;
|
||||
}
|
||||
std::istringstream iss(query);
|
||||
std::string param;
|
||||
while (std::getline(iss, param, '&')) {
|
||||
size_t equal_pos = param.find('=');
|
||||
if (equal_pos != std::string::npos) {
|
||||
const std::string key = param.substr(0, equal_pos);
|
||||
const std::string value = param.substr(equal_pos + 1);
|
||||
u.params[key] = value;
|
||||
} else {
|
||||
u.params[param] = "";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Url::Url(const std::string &url) {
|
||||
size_t question_mark_pos = url.find('?');
|
||||
|
Reference in New Issue
Block a user