xlogin 0.15.3 → 0.15.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f70683b7d62c67930ee2b1d751e8b08de39e1ab9501c7c3941f65c58dcb4230
-  data.tar.gz: 5e2aec6727af661463c755f4c730f74d1c35a6381e269a172090759372ede5db
+  metadata.gz: 1f333ffef6f055b9ffb8d986d1dd8137483d685d1c51680ed5ac280daad66ec2
+  data.tar.gz: 823ef09cd1c287fe17c15988357d14621e34d133674f96e1553791bc7c791dcd
 SHA512:
-  metadata.gz: 8b405fd67ab614bfead70cd94be9de78119b53291f8e111809a749cfcc36061bbb85d7ee7bd4e4858d53fc51264d9399ecf145fde13939662deac5e51b4df54e
-  data.tar.gz: b1750b6fa4ec8636535866e0de63c479890422e2b6026ed0724276c4fee3531c146286aafec6534fe07f371f95641efa3673f95e24ce87b059e4d3a840849009
+  metadata.gz: 294d3d7d4f46c29e76bac6157ddbc94c4787e12fe907134333b477579a480db3f6867d6f0689a3b48b4fd0c65bbcdcc080a10633c941bd4f02ca0d47dd19c2d9
+  data.tar.gz: d17d60532330cc5dd16644f459d8a19509fe95950c01970e92315cd25b8e09547c9a7a071d52661a557d3e70935a39f03ba85b1fa058448b8b640da743630138

data/lib/xlogin/factory.rb

@@ -26,9 +26,10 @@ module Xlogin
     end
 
     def list_hostinfo(*patterns)
+      patterns = patterns.flat_map{ |e| e.split(/\s+/) }.compact
       return @inventory.values if patterns.empty?
 
-      values1 = patterns.compact.map do |pattern|
+      values1 = patterns.map do |pattern|
         values2 = pattern.split(',').map do |entry|
           key, val = entry.to_s.split(':')
           key, val = 'name', key if val.nil?

data/lib/xlogin/session.rb

@@ -24,7 +24,7 @@ module Xlogin
       @loggers  = [@config.log].flatten.uniq.reduce({}){ |a, e| a.merge(e => build_log(e)) }
       @host, @port = Xlogin.factory.open_tunnel(@tunnel, @host, @port) if @tunnel
 
-      max_retry = @config.retry || 1
+      num_try = 0
       username, password = uri.userinfo.to_s.split(':')
 
       begin
@@ -43,7 +43,10 @@ module Xlogin
 
         super(args)
       rescue => e
-        retry if (max_retry -= 1) > 0
+        unless (num_try += 1) > (@config.retry || 0)
+          sleep 2.0 ** (num_try)
+          retry 
+        end
         raise e
       end
     end

data/lib/xlogin/session_pool.rb

@@ -25,7 +25,7 @@ module Xlogin
       session = deq
       Thread.handle_interrupt(Exception => :immediate){ yield session }
     ensure
-      enq session
+      enq session if session
     end
 
     def close
@@ -38,14 +38,15 @@ module Xlogin
     def deq
       @mutex.synchronize do
         if @queue.empty? && @count < @size
+          session = Xlogin.get(@args, **@opts)
           @count += 1
-          return Xlogin.get(@args, **@opts)
+          return session
         end
       end
 
-      session, last_used, watch_dog = @queue.deq
+      session, last_used, watchdog = @queue.deq
 
-      watch_dog.kill
+      watchdog.kill
       if Time.now - last_used > @idle
         destroy(session)
         return deq
@@ -62,8 +63,8 @@ module Xlogin
 
     def enq(session)
       last_used = Time.now
-      watch_dog = Thread.new(session){ |s| sleep(@idle * 1.5) && s.close rescue nil }
-      @queue.enq [session, last_used, watch_dog]
+      watchdog = Thread.new(session){ |s| sleep(@idle * 1.5) && s.close rescue nil }
+      @queue.enq [session, last_used, watchdog]
     end
 
     private

data/lib/xlogin/version.rb

@@ -1,3 +1,3 @@
 module Xlogin
-	VERSION = "0.15.3"
+	VERSION = "0.15.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xlogin
 version: !ruby/object:Gem::Version
-  version: 0.15.3
+  version: 0.15.8
 platform: ruby
 authors:
 - haccht
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-16 00:00:00.000000000 Z
+date: 2021-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-telnet