From 0306863d7180e7f3ed3a6db493a61ebd38f46a2a Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <tgx_world@hotmail.com>
Date: Mon, 15 May 2017 19:47:40 +0800
Subject: [PATCH] Fix the build on travis.

---
 Gemfile.lock         |  2 +-
 lib/socket_server.rb | 14 ++++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 13664e3eb13..aa006ab0318 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -80,7 +80,7 @@ GEM
     diff-lcs (1.3)
     discourse-qunit-rails (0.0.9)
       railties
-    discourse_image_optim (0.24.4)
+    discourse_image_optim (0.24.5)
       exifr (~> 1.2, >= 1.2.2)
       fspath (~> 3.0)
       image_size (~> 1.5)
diff --git a/lib/socket_server.rb b/lib/socket_server.rb
index de18d22c849..0cd4ffadd50 100644
--- a/lib/socket_server.rb
+++ b/lib/socket_server.rb
@@ -16,7 +16,8 @@ class SocketServer
   end
 
   def stop
-    @server.close if @server
+    @server&.close rescue nil
+    FileUtils.rm_f(@socket_path)
     @server = nil
     @blk = nil
   end
@@ -26,9 +27,14 @@ class SocketServer
   def new_accept_thread
     server = @server
     Thread.new do
-      done = false
-      while !done
-        done = !accept_connection(server)
+      begin
+        done = false
+        while !done
+          done = !accept_connection(server)
+        end
+      ensure
+        self.stop
+        Rails.logger.info("Cleaned up socket server at #{@socket_path}")
       end
     end
   end