don't use msgpack-rpc

1 files changed, 11 insertions, 18 deletions

diff --git a/app/models/worker_manager.rb b/app/models/worker_manager.rb
index 6eac369..7a7d48e 100644
--- a/app/models/worker_manager.rb
+++ b/app/models/worker_manager.rb
@@ -1,33 +1,26 @@
-require "msgpack/rpc/transport/unix"
-
 class WorkerManager
   class << self
-    def alive?
-      !!client
-    rescue Aclog::Exceptions::WorkerConnectionError
-      false
-    end
-
     def update_account(account)
       if account.active?
-        client.call(:register_account, account.id)
+        call(:register_account, account.id)
       else
-        client.call(:deactivate_account, account.id)
+        call(:deactivate_account, account.id)
       end
     end
 
     def status
-      client.call(:status)
+      call(:status)
     end
 
     private
-    def client
-      begin
-        transport = MessagePack::RPC::UNIXTransport.new
-        MessagePack::RPC::Client.new(transport, Rails.root.join("tmp", "sockets", "collector.sock").to_s)
-      rescue Errno::ECONNREFUSED, Errno::ENOENT
-        raise Aclog::Exceptions::WorkerConnectionError, "Couldn't connect to the background worker"
-      end
+    def call(meth, *args)
+      Socket.unix(Rails.root.join("tmp", "sockets", "collector.sock").to_s) { |sock|
+        sock.write({ method: meth, arguments: args }.to_msgpack)
+        sock.close_write
+        MessagePack.unpack(sock.read)
+      }
+    rescue SystemCallError
+      raise Aclog::Exceptions::WorkerConnectionError, "Couldn't connect to the background worker"
     end
   end
 end