github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 20:11:11 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #4870 from tgxworld/fix_cleanup_sockets_servers

Browse Source 
FIX: Ensure we clean up socket servers.
This commit is contained in:
Sam
2017-05-24 12:33:34 -04:00
committed by GitHub
parent 3aa3c915e7 0306863d71
commit 405fd9c15d
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/socket_server.rb
View File

@ -16,7 +16,8 @@ class SocketServer
end end
def stop def stop
@server.close if @server @server&.close rescue nil
FileUtils.rm_f(@socket_path)
@server = nil @server = nil
@blk = nil @blk = nil
end end
@ -26,9 +27,14 @@ class SocketServer
def new_accept_thread def new_accept_thread
server = @server server = @server
Thread.new do Thread.new do
done = false begin
while !done done = false
done = !accept_connection(server) while !done
done = !accept_connection(server)
end
ensure
self.stop
Rails.logger.info("Cleaned up socket server at #{@socket_path}")
end end
end end
end end