haraldwolff
/
collabora-online
mirror of https://github.com/CollaboraOnline/online.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

wsd: minor cleanup of Admin::getLogLines 

Change-Id: Ic238dcb7996c2967355366c062f0b94912d7adc7
Signed-off-by: Ashod Nakashian <ashod.nakashian@collabora.co.uk>
pull/8581/head
Ashod Nakashian 2024-03-18 06:20:42 -04:00 committed by Ashod Nakashian
parent 0a78d691ab
commit 00d483f67d
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
wsd/Admin.cpp
View File

@ -819,11 +819,12 @@ std::string Admin::getLogLines()
{
ASSERT_CORRECT_THREAD();
try {
int lineCount = 500;
try
{
static const std::string fName = COOLWSD::getPathFromConfig("logging.file.property[0]");
std::ifstream infile(fName);
std::size_t lineCount = 500;
std::string line;
std::deque<std::string> lines;
@ -831,7 +832,7 @@ std::string Admin::getLogLines()
{
std::istringstream iss(line);
lines.push_back(line);
if (lines.size() > (size_t)lineCount)
if (lines.size() > lineCount)
{
lines.pop_front();
}
@ -839,16 +840,21 @@ std::string Admin::getLogLines()
infile.close();
if (lines.size() < (size_t)lineCount)
if (lines.size() < lineCount)
{
lineCount = (int)lines.size();
lineCount = lines.size();
}
line.clear(); // Use the same variable to include result.
// Newest will be on top.
for (int i = lineCount - 1; i >= 0; i--)
if (lineCount > 0)
{
line += "\n" + lines[i];
line.reserve(lineCount * 128); // Avoid repeated resizing.
// Newest will be on top.
for (int i = static_cast<int>(lineCount) - 1; i >= 0; i--)
{
line += '\n';
line += lines[i];
}
}
return line;