добавил обратную сортировку лога
This commit is contained in:
@@ -1,6 +1,7 @@
|
|||||||
paramLogs: {
|
paramLogs: {
|
||||||
submitClearLogs: false,
|
submitClearLogs: false,
|
||||||
submitUpdateLogs: false,
|
submitUpdateLogs: false,
|
||||||
|
revercePreview: true,
|
||||||
data: "",
|
data: "",
|
||||||
level: ""
|
level: ""
|
||||||
},
|
},
|
||||||
|
@@ -1,7 +1,7 @@
|
|||||||
logsUpdate() {
|
logsUpdate() {
|
||||||
if (this.paramLogs.submitUpdateLogs) { return }
|
if (this.paramLogs.submitUpdateLogs) { return }
|
||||||
this.paramLogs.submitUpdateLogs = true
|
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) => {
|
.then(async (resp) => {
|
||||||
this.paramLogs.data = await resp.text()
|
this.paramLogs.data = await resp.text()
|
||||||
})
|
})
|
||||||
|
@@ -6,6 +6,7 @@
|
|||||||
"widget": "select", "label": "Фильтрация лога (отображение)", "name": "level",
|
"widget": "select", "label": "Фильтрация лога (отображение)", "name": "level",
|
||||||
"values": [{"label": "Без фильтрации", "value": "''"}, {"label": "Информация", "value": "'info'"}, {"label": "Предупреждение", "value": "'warning'"}, {"label": "Ошибка", "value": "'error'"}, {"label": "Фатальная ошибка", "value": "'fatal'"}]
|
"values": [{"label": "Без фильтрации", "value": "''"}, {"label": "Информация", "value": "'info'"}, {"label": "Предупреждение", "value": "'warning'"}, {"label": "Ошибка", "value": "'error'"}, {"label": "Фатальная ошибка", "value": "'fatal'"}]
|
||||||
}) | indent(8, true) }}
|
}) | 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>
|
<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>
|
<a href="/api/get/manager.log" class="action-button" download>Скачать все</a>
|
||||||
<pre style="overflow-x: auto">{{ '{{ paramLogs.data }}' }}</pre>
|
<pre style="overflow-x: auto">{{ '{{ paramLogs.data }}' }}</pre>
|
||||||
|
@@ -997,7 +997,7 @@ std::vector<std::string> getLogFilesSorted(const std::string& path) {
|
|||||||
|
|
||||||
api_driver::obj::TerminalManagerLogs::TerminalManagerLogs(const std::string& path): logsFileDir(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);
|
auto logFiles = getLogFilesSorted(logsFileDir);
|
||||||
if (logFiles.empty()) return "No log files found...";
|
if (logFiles.empty()) return "No log files found...";
|
||||||
|
|
||||||
@@ -1032,15 +1032,23 @@ std::string api_driver::obj::TerminalManagerLogs::loadPreview() {
|
|||||||
// Собираем результат в правильном порядке
|
// Собираем результат в правильном порядке
|
||||||
std::string result;
|
std::string result;
|
||||||
result.reserve(lines.size() * 100); // Предполагаемая средняя длина строки
|
result.reserve(lines.size() * 100); // Предполагаемая средняя длина строки
|
||||||
for (auto it = lines.rbegin(); it != lines.rend(); ++it) {
|
if (isReverse) {
|
||||||
result += *it;
|
for (auto line: lines) {
|
||||||
result += '\n';
|
result += line;
|
||||||
|
result += '\n';
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
for (auto it = lines.rbegin(); it != lines.rend(); ++it) {
|
||||||
|
result += *it;
|
||||||
|
result += '\n';
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return result;
|
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...";
|
return "Logs level " + logLevel + " filtering not supported yet...";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -263,9 +263,9 @@ namespace api_driver::obj {
|
|||||||
|
|
||||||
TerminalManagerLogs(const std::string& path);
|
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);
|
void loadFullLog(std::vector<char>& destData);
|
||||||
|
|
||||||
|
@@ -683,6 +683,11 @@ public:
|
|||||||
isPreview = true;
|
isPreview = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool isReversePreview = false;
|
||||||
|
if (req.url->params.find("reverse") != req.url->params.end()) {
|
||||||
|
isReversePreview = true;
|
||||||
|
}
|
||||||
|
|
||||||
std::string logLevelFilter;
|
std::string logLevelFilter;
|
||||||
if (req.url->params.find("level") != req.url->params.end()) {
|
if (req.url->params.find("level") != req.url->params.end()) {
|
||||||
logLevelFilter = req.url->params["level"];
|
logLevelFilter = req.url->params["level"];
|
||||||
@@ -692,7 +697,7 @@ public:
|
|||||||
rep.headers.push_back({.name = "Content-Type", .value = toString(mime_types::text_plain)});
|
rep.headers.push_back({.name = "Content-Type", .value = toString(mime_types::text_plain)});
|
||||||
rep.content.clear();
|
rep.content.clear();
|
||||||
if (isPreview) {
|
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());
|
rep.content.insert(rep.content.end(), result.c_str(), result.c_str() + result.size());
|
||||||
} else {
|
} else {
|
||||||
this->api->logs.loadFullLog(rep.content);
|
this->api->logs.loadFullLog(rep.content);
|
||||||
|
@@ -26,17 +26,19 @@ namespace http::server {
|
|||||||
}
|
}
|
||||||
|
|
||||||
static void parseParams(Url& u, const std::string& query) {
|
static void parseParams(Url& u, const std::string& query) {
|
||||||
std::istringstream iss(query);
|
std::istringstream iss(query);
|
||||||
std::string param;
|
std::string param;
|
||||||
while (std::getline(iss, param, '&')) {
|
while (std::getline(iss, param, '&')) {
|
||||||
size_t equal_pos = param.find('=');
|
size_t equal_pos = param.find('=');
|
||||||
if (equal_pos != std::string::npos) {
|
if (equal_pos != std::string::npos) {
|
||||||
const std::string key = param.substr(0, equal_pos);
|
const std::string key = param.substr(0, equal_pos);
|
||||||
const std::string value = param.substr(equal_pos + 1);
|
const std::string value = param.substr(equal_pos + 1);
|
||||||
u.params[key] = value;
|
u.params[key] = value;
|
||||||
}
|
} else {
|
||||||
|
u.params[param] = "";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
Url::Url(const std::string &url) {
|
Url::Url(const std::string &url) {
|
||||||
size_t question_mark_pos = url.find('?');
|
size_t question_mark_pos = url.find('?');
|
||||||
|
@@ -311,6 +311,11 @@
|
|||||||
</select>
|
</select>
|
||||||
</label>
|
</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>
|
<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>
|
<a href="/api/get/manager.log" class="action-button" download>Скачать все</a>
|
||||||
<pre style="overflow-x: auto">{{ paramLogs.data }}</pre>
|
<pre style="overflow-x: auto">{{ paramLogs.data }}</pre>
|
||||||
@@ -452,6 +457,7 @@
|
|||||||
paramLogs: {
|
paramLogs: {
|
||||||
submitClearLogs: false,
|
submitClearLogs: false,
|
||||||
submitUpdateLogs: false,
|
submitUpdateLogs: false,
|
||||||
|
revercePreview: true,
|
||||||
data: "",
|
data: "",
|
||||||
level: ""
|
level: ""
|
||||||
},
|
},
|
||||||
@@ -955,7 +961,7 @@
|
|||||||
logsUpdate() {
|
logsUpdate() {
|
||||||
if (this.paramLogs.submitUpdateLogs) { return }
|
if (this.paramLogs.submitUpdateLogs) { return }
|
||||||
this.paramLogs.submitUpdateLogs = true
|
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) => {
|
.then(async (resp) => {
|
||||||
this.paramLogs.data = await resp.text()
|
this.paramLogs.data = await resp.text()
|
||||||
})
|
})
|
||||||
|
Reference in New Issue
Block a user