Mirrors/eepp
1
0
Fork 0
mirror of https://github.com/SpartanJ/eepp.git synced 2026-06-02 03:26:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Safer LSP Server shutdown.

Browse Source
This commit is contained in:
Martín Lucas Golini
2024-04-29 19:36:33 -03:00
parent ab39db1ab8
commit c6aedb8dd3
1 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/tools/ecode/plugins/lsp/lspclientserver.cpp
View File

@@ -1156,7 +1156,7 @@ LSPClientServer::LSPClientServer( LSPClientServerManager* manager, const String:
LSPClientServer::~LSPClientServer() {
shutdown();
std::unique_lock<std::mutex> lock( mShutdownMutex );
mShutdownCond.wait( lock, [this]() { return !mReady; } );
mShutdownCond.wait_for( lock, std::chrono::milliseconds( 275 ), [this]() { return !mReady; } );
eeSAFE_DELETE( mSocket );
{
Lock l( mClientsMutex );
@@ -1398,9 +1398,15 @@ LSPClientServer::LSPRequestHandle LSPClientServer::send( json&& msg, const JsonR
if ( isRunning() ) {
return write( std::move( msg ), h, eh );
} else {
Log::warning( "LSPClientServer server %s Send for non-running server: %s",
mLSP.name.c_str(), mLSP.name.c_str() );
auto msg( String::format( "LSPClientServer server %s Send for non-running server: %s",
mLSP.name, mLSP.name ) );
Log::warning( msg );
notifyServerError();
if ( eh )
eh( {}, { { MEMBER_ERROR, msg } } );
}
return LSPRequestHandle();
}
@@ -1408,11 +1414,25 @@ LSPClientServer::LSPRequestHandle LSPClientServer::send( json&& msg, const JsonR
LSPClientServer::LSPRequestHandle LSPClientServer::sendSync( json&& msg, const JsonReplyHandler& h,
const JsonReplyHandler& eh ) {
if ( isRunning() ) {
return write( std::move( msg ), h, eh );
auto ret = write( std::move( msg ), h, eh );
if ( ret.isEmpty() && h ) {
if ( eh ) {
eh( {}, { { MEMBER_ERROR,
String::format(
"LSPClientServer server %s Unknown error sending sync message",
mLSP.name ) } } );
}
}
} else {
Log::warning( "LSPClientServer server %s Send for non-running server: %s",
mLSP.name.c_str(), mLSP.name.c_str() );
auto msg( String::format( "LSPClientServer server %s Send for non-running server: %s",
mLSP.name, mLSP.name ) );
Log::warning( msg );
notifyServerError();
if ( eh )
eh( {}, { { MEMBER_ERROR, msg } } );
}
return LSPRequestHandle();
}