Skip to content

Fix deadlock on Ctrl+C in server mode #1649

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
st0012 merged 1 commit into from
Mar 16, 2026
Merged

Fix deadlock on Ctrl+C in server mode #1649

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions lib/rdoc/rdoc.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -546,10 +546,6 @@ def generate

def start_server
server = RDoc::Server.new(self, @options.server_port)

trap('INT') { server.shutdown }
trap('TERM') { server.shutdown }

server.start
end

Expand Down
11 changes: 3 additions & 8 deletions lib/rdoc/server.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,15 +91,10 @@ def start
loop do
client = @tcp_server.accept
Thread.new(client) { |c| handle_client(c) }
rescue IOError
break
end
end

##
# Shuts down the server.

def shutdown
rescue Interrupt
# Ctrl+C
ensure
@running = false
@tcp_server&.close
@watcher_thread&.join(2)
Expand Down
Loading