Avoid trying to acquire lock twice when shutting down (#3036)

Shopify · Jan 10, 2025 · a49104e · a49104e
1 parent 6e90780
commit a49104e
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/lib/ruby_lsp/base_server.rb b/lib/ruby_lsp/base_server.rb
@@ -100,11 +100,7 @@ def start
             @writer.write(Result.new(id: message[:id], response: nil).to_hash)
           end
         when "exit"
-          @global_state.synchronize do
-            status = @incoming_queue.closed? ? 0 : 1
-            send_log_message("Shutdown complete with status #{status}")
-            exit(status)
-          end
+          @global_state.synchronize { exit(@incoming_queue.closed? ? 0 : 1) }
         else
           @incoming_queue << message
         end
@@ -119,8 +115,8 @@ def run_shutdown
       @outgoing_queue.close
       @cancelled_requests.clear
 
-      @worker.join
-      @outgoing_dispatcher.join
+      @worker.terminate
+      @outgoing_dispatcher.terminate
       @store.clear
     end