mirror of
https://github.com/Icinga/icinga2.git
synced 2025-07-25 14:44:32 +02:00
ApiListener#ReplayLog(): stop reading files ASAP on send error
This commit is contained in:
parent
b538ad2528
commit
f074e24d2a
@ -1462,7 +1462,9 @@ void ApiListener::ReplayLog(const JsonRpcConnection::Ptr& client)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
for (;;) {
|
bool stopReplay = false;
|
||||||
|
|
||||||
|
do {
|
||||||
std::unique_lock<std::mutex> lock(m_LogLock);
|
std::unique_lock<std::mutex> lock(m_LogLock);
|
||||||
|
|
||||||
CloseLogFile();
|
CloseLogFile();
|
||||||
@ -1545,6 +1547,7 @@ void ApiListener::ReplayLog(const JsonRpcConnection::Ptr& client)
|
|||||||
Log(LogDebug, "ApiListener")
|
Log(LogDebug, "ApiListener")
|
||||||
<< "Error while replaying log for endpoint '" << endpoint->GetName() << "': " << DiagnosticInformation(ex);
|
<< "Error while replaying log for endpoint '" << endpoint->GetName() << "': " << DiagnosticInformation(ex);
|
||||||
|
|
||||||
|
stopReplay = true;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1566,6 +1569,10 @@ void ApiListener::ReplayLog(const JsonRpcConnection::Ptr& client)
|
|||||||
}
|
}
|
||||||
|
|
||||||
logStream->Close();
|
logStream->Close();
|
||||||
|
|
||||||
|
if (stopReplay) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (count > 0) {
|
if (count > 0) {
|
||||||
@ -1578,16 +1585,14 @@ void ApiListener::ReplayLog(const JsonRpcConnection::Ptr& client)
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (last_sync) {
|
if (last_sync) {
|
||||||
{
|
|
||||||
ObjectLock olock2(endpoint);
|
|
||||||
endpoint->SetSyncing(false);
|
|
||||||
}
|
|
||||||
|
|
||||||
OpenLogFile();
|
OpenLogFile();
|
||||||
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
} while (!stopReplay);
|
||||||
|
|
||||||
|
ObjectLock olock2 (endpoint);
|
||||||
|
endpoint->SetSyncing(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
void ApiListener::StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata)
|
void ApiListener::StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user