xlogin 0.14.5 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a6aa103f9d9af99c52b9fc954ad2f7df5b21348b6f4c54f6b2b22410949688f
-  data.tar.gz: 91c82b18fd5dd3c3f1015ead5c52f159be0d8fb7b442e9f01dc2fb674c594f03
+  metadata.gz: cda6f2be936220ffb49b9d586d0e8ebcd248194bb0d16b7bc595ab3209da42da
+  data.tar.gz: 484a16a9c5f1e3eaa9d65f85de52e634ffb29a6b4e66f5461385c1f29c115ae6
 SHA512:
-  metadata.gz: 5fad4a763c96dd13513386c9d63560684012706c598823f66124796b79a0b1f09f3a265cbbfa4ae8fbad849f5b2ad52479fb9c2ecd4e55d083383eb4ed92e5f2
-  data.tar.gz: 6b6e523c0bbf6a59468c16cf38370cf3b590b53890ba953c1d151c2cb881d512c3c485ae86719541346c9b11824cfec03fccf6b42526cb92b0188a0c6f71eca9
+  metadata.gz: 0562b0ad712a00b3b2dd8d36b43c3fc15f1435492f9c025e374c52a1a92495575667476dfe1e679a57a6f396b5eba0bad2341d56c0a36454e70ff7737c656ac8
+  data.tar.gz: 716231e8c898ebb0d10b85a58c422f9815361e9c4303c803f2ca40c80fd83e957cd135b3f2db920ec12468e04e42d25f3c5b0213120e149451a62535b218b71b

data/lib/xlogin.rb

@@ -40,15 +40,13 @@ module Xlogin
       return session unless block
       begin block.call(session) ensure session.close end
     end
-    alias_method :create, :get
 
-    def get_pool(args, **opts, &block)
+    def pool(args, **opts, &block)
       pool = factory.build_pool(args, **opts)
 
       return pool unless block
       begin block.call(pool) ensure pool.close end
     end
-    alias_method :create_pool, :get_pool
 
     def configure(&block)
       instance_eval(&block)

data/lib/xlogin/factory.rb

@@ -13,7 +13,7 @@ module Xlogin
     def initialize
       @inventory = Hash.new
       @templates = Hash.new
-      @gateways  = Hash.new
+      @tunnels   = Hash.new
       @mutex     = Mutex.new
     end
 
@@ -54,32 +54,40 @@ module Xlogin
       @templates.keys
     end
 
-    def open_tunnel(tunnel, host, port)
+    def open_tunnel(name, host, port)
       @mutex.synchronize do
-        unless @gateways[tunnel]
-          gateway_uri = Addressable::URI.parse(tunnel)
-          case gateway_uri.scheme
+        unless @tunnels[name]
+          uri = Addressable::URI.parse(name)
+          case uri.scheme
           when 'ssh'
-            username, password = *gateway_uri.userinfo.split(':')
-            @gateways[tunnel] = Net::SSH::Gateway.new(
-              gateway_uri.host,
+            username, password = *uri.userinfo.split(':')
+            gateway = Net::SSH::Gateway.new(
+              uri.host,
               username,
               password: password,
-              port: gateway_uri.port || 22
+              port: uri.port || 22
             )
+
+             @tunnels[name] = Struct.new('Tunnel', :gateway, :ports).new(gateway, [])
           end
         end
 
-        gateway = @gateways[tunnel]
-        return host, port unless gateway
-        return '127.0.0.1', gateway.open(host, port)
+        if tunnel = @tunnels[name]
+          port = tunnel.gateway.open(host, port)
+          host = '127.0.0.1'
+          tunnel.ports << port
+        end
+        return host, port
       end
     end
 
-    def close_tunnel(tunnel, port)
+    def close_tunnel(name, port)
       @mutex.synchronize do
-        gateway = @gateways[tunnel]
-        gateway.close(port) if gateway
+        if tunnel = @tunnels[name]
+          tunnel.ports.delete(port)
+          tunnel.gateway.close(port)
+          tunnel.gateway.shutdown! if tunnel.ports.empty?
+        end
       end
     end
 

data/lib/xlogin/session_pool.rb

@@ -13,20 +13,12 @@ module Xlogin
       @args = args
       @opts = opts
 
-      @size = DEFAULT_POOL_SIZE
-      @idle = DEFAULT_POOL_IDLE
+      @size = @opts.delete(:pool_size) || DEFAULT_POOL_SIZE
+      @idle = @opts.delete(:pool_idle) || DEFAULT_POOL_IDLE
 
       @mutex = Mutex.new
       @queue = Queue.new
-      @created  = 0
-    end
-
-    def size=(val)
-      @mutex.synchronize{ @size = val }
-    end
-
-    def idle=(val)
-      @mutex.synchronize{ @idle = val }
+      @count = 0
     end
 
     def with
@@ -38,20 +30,22 @@ module Xlogin
 
     def close
       until @queue.empty?
-        session, _ = @queue.deq
+        session, _, _ = @queue.deq
         destroy(session)
       end
     end
 
     def deq
       @mutex.synchronize do
-        if @queue.empty? && @created < @size
-          @created += 1
+        if @queue.empty? && @count < @size
+          @count += 1
           return Xlogin.get(@args, **@opts)
         end
       end
 
-      session, last_used = @queue.deq
+      session, last_used, watch_dog = @queue.deq
+
+      watch_dog.kill
       if Time.now - last_used > @idle
         destroy(session)
         return deq
@@ -59,23 +53,24 @@ module Xlogin
 
       begin
         raise IOError if session&.sock&.closed?
+        return session
       rescue IOError, EOFError, Errno::ECONNABORTED, Errno::ECONNREFUSED, Errno::ECONNRESET
         destroy(session)
         return deq
       end
-
-      session
     end
 
     def enq(session)
       last_used = Time.now
-      @queue.enq [session, last_used]
+      watch_dog = Thread.new(session){ |s| sleep(@idle * 1.5) && s.close rescue nil }
+      @queue.enq [session, last_used, watch_dog]
     end
 
+    private
     def destroy(session)
       @mutex.synchronize do
         session.close rescue nil
-        @created -= 1
+        @count -= 1
       end
     end
 

data/lib/xlogin/version.rb

@@ -1,3 +1,3 @@
 module Xlogin
-	VERSION = "0.14.5"
+	VERSION = "0.15.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xlogin
 version: !ruby/object:Gem::Version
-  version: 0.14.5
+  version: 0.15.0
 platform: ruby
 authors:
 - haccht
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-18 00:00:00.000000000 Z
+date: 2020-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-telnet