socket_duplex 1.1.4 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd7858a97d9298289df3a28e442b08de176037fd
-  data.tar.gz: 9ed7ff8d36e75df4515a12443fe9393c98c71643
+  metadata.gz: dd2f17bdd206534047e35566999937cdd332b912
+  data.tar.gz: 7502e0228ba1ebed5269c49bb698ba5ac41a0c11
 SHA512:
-  metadata.gz: d70a1620423200f85664b8ada1bae89f937d581e076b2e3b17496a8c6bfda5efa9bc78b26c4575bd705a1a62c5599d2cd4e8165e814f4dc63257b717341a11a7
-  data.tar.gz: 25c070803d311e6831fb6afff2ab56310113a3fe2b6a1414f9d06174579f7a9333d3308437b1684e15f2273e6a6c38e9ba5b0c42feb73767ca980f883cf27815
+  metadata.gz: df436ea1c4ae42e96fe9c346739b5bdfa354cfbdf93954b2ab880b6d47d202c40eaedea0478cd40ed20dd997a1d477e52c0a4d1fbd1a0bd5bd1cf2e8215e275f
+  data.tar.gz: 82d081d2e7cf6b486440a26ecb210beb7cd3e348079e5aaf7432cd16b71a53c68a36a65dba1008e64df9afc5a65b201ffb4db1fbeaed97f2eb60327d8e7c1586

data/lib/socket_duplex.rb

@@ -8,6 +8,7 @@ module Rack
   class SocketDuplex
     MAX_QUEUE_SIZE = 50
     NUM_OF_THREADS = 5
+    @@queue = Utils::QUERY_STRING.new
 
     def initialize(app, socket_path, secful_key, verify_mode=OpenSSL::SSL::VERIFY_PEER)
       @app, @socket_path, @verify_mode = app, socket_path, verify_mode
@@ -19,8 +20,8 @@ module Rack
         puts 'secful: agent_identifier'
         @machine_ip = Socket.ip_address_list.detect(&:ipv4_private?).try(:ip_address)
         puts 'secful: machine_ip'
-        @queue = SizedQueue.new(MAX_QUEUE_SIZE)
-        puts 'secful: queue'
+        #@queue = SizedQueue.new(MAX_QUEUE_SIZE)
+        #puts 'secful: queue init ' + @queue.__id__.to_s
         @threads_to_sockets = {}
         puts 'secful: threads_to_sockets'
         Thread.new { activate_workers() }
@@ -48,10 +49,10 @@ module Rack
       puts 'secful: _call'
       status, headers, body = @app.call(env)
       puts 'secful: app.call'
-      puts 'secful: queue.len = ' + @queue.length.to_s
-      if @queue.length < @queue.max
+      puts 'secful: queue.len = ' + @@queue.length.to_s
+      if @@queue.length < MAX_QUEUE_SIZE
         puts 'secful: about to put in queue'
-        @queue << env
+        @@queue << env
         puts 'secful: put in queue'
       end
       return [status, headers, body]
@@ -69,8 +70,12 @@ module Rack
     def worker
       loop do
         begin
-          puts 'secful: worker start'
-          env = @queue.pop
+          puts 'secful: worker start: ' + @@queue.__id__.to_s
+          begin
+            env = @@queue.pop_with_timeout(1)
+          rescue => e
+            puts 'secful: queue-pop-exception: ' + e.message
+          end
           puts 'secful: worker poped'
           if env
             puts 'secful: env'

data/lib/utils.rb

@@ -0,0 +1,36 @@
+module Rack::Utils
+  #https://spin.atomicobject.com/2014/07/07/ruby-queue-pop-timeout/
+  class QueueWithTimeout
+    def initialize
+      @mutex = Mutex.new
+      @queue = []
+      @recieved = ConditionVariable.new
+    end
+ 
+    def <<(x)
+      @mutex.synchronize do
+        @queue << x
+        @recieved.signal
+      end
+    end
+
+    def length
+      @queue.length
+    end
+ 
+    def pop(non_block = false)
+      pop_with_timeout(non_block ? 0 : nil)
+    end
+ 
+    def pop_with_timeout(timeout = nil)
+      @mutex.synchronize do
+        if @queue.empty?
+          @recieved.wait(@mutex, timeout) if timeout != 0
+          #if we're still empty after the timeout, raise exception
+          raise ThreadError, "queue empty" if @queue.empty?
+        end
+        @queue.shift
+      end
+    end
+  end
+end

data/socket_duplex.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "socket_duplex"
-  spec.version       = '1.1.4'
+  spec.version       = '1.1.5'
   spec.authors       = ["Secful"]
   spec.description   = %q{Rack middleware that duplexes HTTP traffic}
   spec.summary       = spec.description

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: socket_duplex
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors:
 - Secful
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-24 00:00:00.000000000 Z
+date: 2016-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -117,6 +117,7 @@ files:
 - Gemfile
 - README.md
 - lib/socket_duplex.rb
+- lib/utils.rb
 - lib/websocket-client-simple.rb
 - lib/websocket-client-simple/client.rb
 - lib/websocket-client-simple/version.rb