feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

LanguageClient: Introduce timeout for restart counter

Browse Source 
While it makes sense to stop trying to restart a continuously crashing
server, the restart counter should be reset regularly, as it's not
critical if the server restarts "once in a while" during a longer
programming session.

Change-Id: Ia2efca28ae4a4dba72da947d9eb776e3909d0cb3
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Christian Kandeler
2022-08-10 15:37:31 +02:00
parent 2635d62721
commit bd00cc8bf8
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/languageclient/client.cpp
View File

@@ -197,6 +197,11 @@ public:
connect(&m_shutdownTimer, &QTimer::timeout, this, [this] {
LanguageClientManager::deleteClient(q);
});
m_restartCountResetTimer.setSingleShot(true);
m_restartCountResetTimer.setInterval(5 * 60 * 1000);
connect(&m_restartCountResetTimer, &QTimer::timeout,
this, [this] { m_restartsLeft = MaxRestarts; });
}
~ClientPrivate()
@@ -307,7 +312,9 @@ public:
AssistProviders m_clientProviders;
QMap<TextEditor::TextDocument *, AssistProviders> m_resetAssistProvider;
QHash<TextEditor::TextEditorWidget *, LanguageServerProtocol::MessageId> m_highlightRequests;
int m_restartsLeft = 5;
static const int MaxRestarts = 2;
int m_restartsLeft = MaxRestarts;
QTimer m_restartCountResetTimer;
InterfaceController *m_clientInterface = nullptr;
DiagnosticManager *m_diagnosticManager = nullptr;
DocumentSymbolCache m_documentSymbolCache;
@@ -1511,8 +1518,11 @@ bool Client::reset()
bool ClientPrivate::reset()
{
if (!m_restartsLeft)
if (!m_restartsLeft) {
m_restartCountResetTimer.stop();
return false;
}
m_restartCountResetTimer.start();
--m_restartsLeft;
m_state = Client::Uninitialized;
m_responseHandlers.clear();