allq 0.3.8 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a179d72534b0a07bb5b87d02bc7447a48078213
-  data.tar.gz: d96e35f43118aa616418072ac35a121a757ee472
+  metadata.gz: 01b7850787c72b6525e92c9de5d8c92031f22400
+  data.tar.gz: e7e096efb7d8ade52b493b6ae6f63d7c6be145f9
 SHA512:
-  metadata.gz: 31c4823fe3be1fa669e8316f328482e7f2651f23bd18cb388f0fac52b769ab13b957efd68dfee915a363d343c7612f10ebafeccd6d46b0a0bd8af369c768ef88
-  data.tar.gz: 06a81172215aece6a413fe9de35f4f7fbab2cbe00a4664c746ab7fc8642cb6f2350354a84e8c7c35ce970afbfa8388802c2d56847245fdac5ef63a2c2467cfc7
+  metadata.gz: 19ff24d66cce5372cefe16da6a5c585823b363e5228bbf93da9196df6f5793544b51db6eecd56290f701fb23e48aea8bd0dc2b746425fcba8408a96b6bd20a62
+  data.tar.gz: 6e605b1a73b2e68455e06901dcda89329fa8feff0e8868fd894ad601f5a8dfe19feb75eb51b7e5a6330a2fe2515652967ddeac2b4517eed4aad387496c1845c5

data/lib/allq/client.rb

@@ -92,7 +92,7 @@ class AllQ
 
     def reload!
       @connection.close if @connection
-      puts "New --#{@url}"
+      puts "AllQ Connection Started --#{@url}"
       @connection = AllQ::Connection.new(@url)
       @get_action = AllQ::Get.new(@connection, self)
       @put_action = AllQ::Put.new(@connection, self)

data/lib/allq/connection.rb

@@ -30,8 +30,6 @@ class AllQ
     #
     def initialize(address = '')
       @address = address || _host_from_env
-      @mutex = Mutex.new
-      establish_connection
     rescue
       _raise_not_connected!
     end
@@ -46,7 +44,7 @@ class AllQ
       yield block.call(res)
     end
 
-    def call_socat(data, timeout = 1.0)
+    def call_socat(data, timeout = 3.0)
       cmd_string = "echo '#{data}' | socat -t #{timeout} - tcp4-connect:#{@address}"
       output = `#{cmd_string}`
       return output
@@ -63,10 +61,9 @@ class AllQ
     #
     def transmit(command, options={}, &block)
       _with_retry(options[:retry_interval], options[:init]) do
-        @mutex.synchronize do
-          res = call_socat(command.to_s, 20.0)
-          yield block.call(res)
-        end
+        res = call_socat(command.to_s, 20.0)
+        raise "Socat failed after 20 seconds" if res.to_s == ""
+        yield block.call(res)
       end
     end
 
@@ -76,10 +73,6 @@ class AllQ
     #  @conn.close
     #
     def close
-      if @connection
-        @connection.close
-        @connection = nil
-      end
     end
 
     # Returns string representation of job.
@@ -102,11 +95,6 @@ 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
@@ -121,6 +109,7 @@ class AllQ
     def _with_retry(retry_interval, init=true, tries=MAX_RETRIES, &block)
       yield
     rescue => ex
+      sleep(tries) if tries > 0
       _reconnect(ex, retry_interval)
       retry
     end

data/lib/allq/version.rb

@@ -1,3 +1,3 @@
 module Allq
-  VERSION = "0.3.8"
+  VERSION = "0.3.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: allq
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.9
 platform: ruby
 authors:
 - Jason
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-20 00:00:00.000000000 Z
+date: 2018-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler