allq 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89cc071fa78a00b3bbda7e21cacfc4cbe20d992c
-  data.tar.gz: d0aecf251d0587c8e0d01f2bdf39099a82f3891b
+  metadata.gz: 780c18967adea5a53a4b82b52b4af5ac6dbfe977
+  data.tar.gz: a079b08e7911d7b503169b2f90a4e513cec62738
 SHA512:
-  metadata.gz: 43cb8d3c2614a46e6e5167613381040487b55aeb6df5cc6e50d4fc705456a5b4c112c9d3c3f8f4bdec17c02c0e40f25edfba12e3a151b47c0667784b873b9f5b
-  data.tar.gz: 0ba32f6101c5a53402697c857d2b2783af11847272b8f9ac65a4a0ae592a71bf7e7472705b3fa509b785a0869f12ded5d049171b2702a734eb0aca9f37dc95b2
+  metadata.gz: '07894d27ff1389c1db25779fe0c09253114df0db3e8c4587bbd25604f232f9a9fe944a30f7b5e38affdc11a451c6770bdd02ceb891bbe6a105df1a27de9c7ce8'
+  data.tar.gz: d8b782e4bbcdf622d6379836f0bda07396ed3d47c9126565d6283d04d9ce1e4a38a15c3615d4e5895293bc6798868fb1903e0fc824c1fe83048de0c652901ccd

data/lib/allq/actions/base.rb

@@ -24,13 +24,21 @@ class AllQ
       data
     end
 
-    def send_hash_as_json(data_hash)
+    def send_hash_as_json(data_hash, ignore_failure = false)
       transmit_data = data_hash.to_json
       result = nil
       puts "transmitting data: #{transmit_data}" if ALLQ_DEBUG_DATA
-      @connection.transmit(transmit_data) do |response|
-        result = response
+      if ignore_failure
+        @connection.socat(transmit_data) do |response|
+          result = response
+        end
+        results = "{}" if results.to_s == ""
+      else
+        @connection.transmit(transmit_data) do |response|
+          result = response
+        end
       end
+
       result
     end
 

data/lib/allq/actions/bury.rb

@@ -5,7 +5,7 @@ class AllQ
       job_id = data[:job_id]
 
       send_data = base_send(job_id)
-      response = send_hash_as_json(send_data)
+      response = send_hash_as_json(send_data, true)
       result = rcv(response)
       return result
     end

data/lib/allq/actions/delete.rb

@@ -5,7 +5,7 @@ class AllQ
       job_id = data[:job_id]
 
       send_data = base_send(job_id)
-      response = send_hash_as_json(send_data)
+      response = send_hash_as_json(send_data, true)
       result = rcv(response)
       return JSON.parse(result)
     end

data/lib/allq/actions/done.rb

@@ -5,7 +5,7 @@ class AllQ
       job_id = data[:job_id]
 
       send_data = base_send(job_id)
-      response = send_hash_as_json(send_data)
+      response = send_hash_as_json(send_data, true)
       rcv(response)
     end
 

data/lib/allq/actions/kick.rb

@@ -6,7 +6,7 @@ class AllQ
       tube = data[:tube]
 
       send_data = base_send(tube)
-      response = send_hash_as_json(send_data)
+      response = send_hash_as_json(send_data, true)
       rcv(response)
     end
 

data/lib/allq/actions/release.rb

@@ -5,7 +5,7 @@ class AllQ
       job_id = data[:job_id]
       delay = data[:delay] || 0
       send_data = base_send(job_id, delay)
-      response = send_hash_as_json(send_data)
+      response = send_hash_as_json(send_data, true)
       result = rcv(response)
       return result["release"] && result["release"]["job_id"]
     end

data/lib/allq/actions/stats.rb

@@ -7,7 +7,7 @@ class AllQ
     def snd(data)
       send_data = base_send(data)
       @breakout = data ? data[:breakout].to_s == "true" : false
-      response = send_hash_as_json(send_data)
+      response = send_hash_as_json(send_data, true)
       rcv(response)
     end
 

data/lib/allq/actions/touch.rb

@@ -5,7 +5,7 @@ class AllQ
       job_id = data[:job_id]
 
       send_data = base_send(job_id)
-      response = send_hash_as_json(send_data)
+      response = send_hash_as_json(send_data, true)
       result = rcv(response)
       return result["touch"] && result["touch"]["job_id"]
     end

data/lib/allq/connection.rb

@@ -30,11 +30,28 @@ class AllQ
     #
     def initialize(address = '')
       @address = address || _host_from_env
+      @mutex = Mutex.new
       establish_connection
     rescue
       _raise_not_connected!
     end
 
+    def socat(command, options={}, &block)
+      send_string = command.to_s
+      if send_string.include?("'")
+        puts "Single quotes not allow in JSON. This will probably error."
+      end
+      res = call_socat(send_string)
+      _raise_not_connected if res.include?("Connection refused")
+      yield block.call(res)
+    end
+
+    def call_socat(data)
+      cmd_string = "echo '#{data}' | socat - tcp4-connect:#{@address}"
+      output = `#{cmd_string}`
+      return output
+    end
+
     # Send commands to allq server via connection.
     #
     # @param [String] command AllQ command
@@ -46,29 +63,25 @@ class AllQ
     #
     def transmit(command, options={}, &block)
       _with_retry(options[:retry_interval], options[:init]) do
-        send_string = command.to_s
-        if send_string.include?("'")
-          puts "Single quotes not allow in JSON. This will probably error."
+        @mutex.synchronize do
+          _raise_not_connected! unless @connection && !@connection.closed?
+          @connection.puts(command.to_s)
+          res = @connection.readline
+          yield block.call(res)
         end
-        res = call_socat(send_string)
-        _raise_not_connected if res.include?("Connection refused")
-        yield block.call(res)
       end
     end
 
-    def call_socat(data)
-      cmd_string = "echo '#{data}' | socat - tcp4-connect:#{address}"
-      output = `#{cmd_string}`
-      return output
-    end
-
     # Close connection with allq server.
     #
     # @example
     #  @conn.close
     #
     def close
-      # no_op
+      if @connection
+        @connection.close
+        @connection = nil
+      end
     end
 
     # Returns string representation of job.
@@ -77,7 +90,7 @@ class AllQ
     #  @conn.inspect
     #
     def to_s
-      "#<AllQ::Connection address=#{address}>"
+      "#<AllQ::Connection host=#{host.inspect} port=#{port.inspect}>"
     end
     alias :inspect :to_s
 
@@ -91,6 +104,11 @@ class AllQ
     #  establish_connection('localhost:3005')
     #
     def establish_connection
+      @address = address.first if address.is_a?(Array)
+      match = address.split(':')
+      @host, @port = match[0], Integer(match[1] || DEFAULT_PORT)
+
+      @connection = TCPSocket.new @host, @port
     end
 
     private
@@ -116,6 +134,7 @@ class AllQ
     # @param [Integer] tries The maximum number of attempts to reconnect
     def _reconnect(original_exception, retry_interval, tries=MAX_RETRIES)
       close
+      establish_connection
     rescue Errno::ECONNREFUSED
       tries -= 1
       if tries.zero?

data/lib/allq/job.rb

@@ -59,10 +59,6 @@ class AllQ
       }
     end
 
-    def reload_client
-      @client.reload!
-    end
-
     def self.new_from_hash(hash, client)
       begin
         id = hash.fetch('job_id')

data/lib/allq/version.rb

@@ -1,3 +1,3 @@
 module Allq
-  VERSION = "0.3.5"
+  VERSION = "0.3.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: allq
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Jason