socket_duplex 1.1.7 → 1.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 396d97092eb58854d336f76c7058737967201b95
-  data.tar.gz: b28000e38753d974e7442f0209b28dc6efe4a3e3
+  metadata.gz: f2b398ca7958f3ac91f2e8ad88c287ae4a529e4a
+  data.tar.gz: 0a75de5c20bf83771e1b5e8890a67afcb8da039d
 SHA512:
-  metadata.gz: 9a53ca6192b230c303f6f0e2bc9069fcd30cf27f1436af1fcab07f62f0b044cc23598f707903a73cccca9afc53bd70b2250d7b7290c030a686b650593312ef4f
-  data.tar.gz: e9728db7f2ba14f3d78101753b6c12f094ff6bca5c50983780e36b2fd735b5672fe08c95bf4409818056cffa4d0f2988ea47e5cf28b5a865bbea62acf98eee89
+  metadata.gz: c79fff5c1468edc7eb0a1466fabf42035dcf9aeb994c252b7012e57ec8274f2195127ac7e301c08bc8c86212f0193877ec66680c27929ba03ace7dc117541b6a
+  data.tar.gz: 915e4c13027ced61b6511253ce2443432f9f33e57ed9dda092f93a4584f6034e98500a27f669c5af675b7321796fa2f0c258507c1ddaff5dd95b927a8ade7087

data/lib/socket_duplex.rb

@@ -12,32 +12,24 @@ module Rack
     def initialize(app, socket_path, secful_key, verify_mode=OpenSSL::SSL::VERIFY_PEER)
       @app, @socket_path, @verify_mode = app, socket_path, verify_mode
       begin
-        puts 'secful: initialize'
         @secful_key = secful_key
-        puts 'secful: secful_key'
         @agent_identifier = SecureRandom.hex
-        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 init ' + @queue.__id__.to_s
+        #@queue = SizedQueue.new(MAX_QUEUE_SIZE)
         @threads_to_sockets = {}
-        puts 'secful: threads_to_sockets'
-        Thread.new { activate_workers() }
-        puts 'secful: activate_workers()'
-      rescue Exception => e  
-        puts 'secful: init-exception: ' + e.message
-        puts 'secful: init-trace: ' + e.backtrace.inspect
+        #Thread.new { activate_workers() }
+      rescue nil  
       end
     end
 
     def call(env)
       begin
-        puts 'secful: call'
+        if !defined? @queue
+          @queue = SizedQueue.new(MAX_QUEUE_SIZE)
+          activate_workers()
+        end
         dup._call(env)
-      rescue Exception => e
-        puts 'secful: call-exception: ' + e.message
-        puts 'secful: call-trace: ' + e.backtrace.inspect
+      rescue nil
         @app.call(env)
       end
     end
@@ -45,59 +37,42 @@ module Rack
     protected
 
     def _call(env)
-      puts 'secful: _call'
       status, headers, body = @app.call(env)
-      puts 'secful: app.call'
-      puts 'secful: queue.len = ' + @queue.length.to_s + ' id: ' + @queue.__id__.to_s
-      if @queue.length < MAX_QUEUE_SIZE
-        puts 'secful: about to put in queue'
+      if @queue.length < MAX_QUEUE_SIZE - 5
         @queue << env
-        puts 'secful: put in queue'
       end
       return [status, headers, body]
     end
 
     def activate_workers
-      puts 'secful: activate_workers'
       NUM_OF_THREADS.times do
-        puts 'secful: new thread'
         thr = Thread.new {worker()}
-        puts 'secful: thread started ' + thr.__id__.to_s
       end
     end
 
     def worker
       loop do
         begin
-          puts 'secful: worker start: ' + Thread.current.__id__.to_s + 'queue: ' + @queue.__id__.to_s
           env = @queue.pop
-          puts 'secful: worker poped'
           if env
-            puts 'secful: env'
             connect_to_ws(Thread.current)
             handle_request(env)
-            puts 'scful: worker done'
           end
-        rescue Exception => e
-          puts 'secful: worker-exception: ' + e.message
-          puts 'secful: worker-trace: ' + e.backtrace.inspect
+        rescue nil
         end
       end
     end
 
     def connect_to_ws(thr)
       begin
-        puts 'secful: connect_to_ws'
         ws = @threads_to_sockets[thr]
         if !ws
-          puts 'secful: creating ws'
           headers = { 'Agent-Type' => 'Ruby',
                       'Agent-Version' => '1.0',
                       'Agent-Identifier' => @agent_identifier,
                       'Authorization' => 'Bearer ' + @secful_key }
           ws = WebSocket::Client::Simple.connect @socket_path, verify_mode: @verify_mode, headers: headers
           sleep(3)
-          puts 'secful: connected to ws'
         end
         if !ws.open?
           sleep(60)
@@ -114,16 +89,11 @@ module Rack
     def handle_request(env)
       request_hash = {}
       if env['rack.url_scheme'] == 'http'
-        puts 'secful: writing env'
         write_env(request_hash, env)
         ws = @threads_to_sockets[Thread.current]
         begin
-          puts 'secful: sending'
           ws.send request_hash.to_json
-          puts 'secful: sent'
         rescue Exception => e
-          puts 'secful: handle_request-exception: ' + e.message  
-          puts 'secful: handle_request-trace: ' + e.backtrace.inspect
           if ws
             ws.close()
           end rescue nil

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.7'
+  spec.version       = '1.1.8'
   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.7
+  version: 1.1.8
 platform: ruby
 authors:
 - Secful
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-25 00:00:00.000000000 Z
+date: 2016-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler