VladislavOstapov/terminal-web-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

добавил обратную сортировку лога

Browse Source
This commit is contained in:
Vladislav Ostapov
2025-09-18 15:32:12 +03:00
parent 9efddd9930
commit 7f21f9488e
8 changed files with 42 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
front-generator/template/common/logs-data.js.j2
View File

@@ -1,6 +1,7 @@
paramLogs: {
submitClearLogs: false,
submitUpdateLogs: false,
revercePreview: true,
data: "",
level: ""
},

2
front-generator/template/common/logs-methods.js.j2
View File

@@ -1,7 +1,7 @@
logsUpdate() {
if (this.paramLogs.submitUpdateLogs) { return }
this.paramLogs.submitUpdateLogs = true
fetch(`/api/get/manager.log?preview=1`, {method: 'GET', credentials: 'same-origin' })
fetch(`/api/get/manager.log?preview${this.paramLogs.revercePreview ? '&reverse' : ''}`, {method: 'GET', credentials: 'same-origin', })
.then(async (resp) => {
this.paramLogs.data = await resp.text()
})

1
front-generator/template/common/logs.html.j2
View File

@@ -6,6 +6,7 @@
"widget": "select", "label": "Фильтрация лога (отображение)", "name": "level",
"values": [{"label": "Без фильтрации", "value": "''"}, {"label": "Информация", "value": "'info'"}, {"label": "Предупреждение", "value": "'warning'"}, {"label": "Ошибка", "value": "'error'"}, {"label": "Фатальная ошибка", "value": "'fatal'"}]
}) | indent(8, true) }}
{{ build_widget('logs', {"widget": "checkbox", "label": "Обратная сортировка строк", "name": "revercePreview"},) | indent(8, true) }}
<button class="action-button" @click="logsUpdate()">Обновить (последние 1000 строк) <span class="submit-spinner" v-show="paramLogs.submitUpdateLogs"></span></button></button>
<a href="/api/get/manager.log" class="action-button" download>Скачать все</a>
<pre style="overflow-x: auto">{{ '{{ paramLogs.data }}' }}</pre>

18
src/api-driver/structs.cpp
View File

@@ -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...";
}

4
src/api-driver/structs.h
View File

@@ -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);

7
src/main.cpp
View File

@@ -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);

20
src/server/request_parser.cpp
View File

@@ -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('?');

8
static/main-tdma.html
View File

@@ -311,6 +311,11 @@
</select>
</label>
<label>
<span>Обратная сортировка строк</span>
<span class="toggle-input"><input type="checkbox" v-model="paramLogs.revercePreview" /><span class="slider"></span></span>
</label>
<button class="action-button" @click="logsUpdate()">Обновить (последние 1000 строк) <span class="submit-spinner" v-show="paramLogs.submitUpdateLogs"></span></button></button>
<a href="/api/get/manager.log" class="action-button" download>Скачать все</a>
<pre style="overflow-x: auto">{{ paramLogs.data }}</pre>
@@ -452,6 +457,7 @@
paramLogs: {
submitClearLogs: false,
submitUpdateLogs: false,
revercePreview: true,
data: "",
level: ""
},
@@ -955,7 +961,7 @@
logsUpdate() {
if (this.paramLogs.submitUpdateLogs) { return }
this.paramLogs.submitUpdateLogs = true
fetch(`/api/get/manager.log?preview=1`, {method: 'GET', credentials: 'same-origin' })
fetch(`/api/get/manager.log?preview${this.paramLogs.revercePreview ? '&reverse' : ''}`, {method: 'GET', credentials: 'same-origin', })
.then(async (resp) => {
this.paramLogs.data = await resp.text()
})