xlogin 0.11.8 → 0.11.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8fd335318689c026b7aa162b99de3a54e4ae760123fef926775bb7cd4d433b49
-  data.tar.gz: 9f343da2fdd052cd9dfb4cc7d7e66de7a2f839549603d9313eaca7b116965f40
+  metadata.gz: 523b5807afae2b2175f43b09e7c05c00d0d5497dc0d639b517b2284081fd1bb9
+  data.tar.gz: e8fdb5028df03bb6c91f21164e2f350db7d1f225c257f8d736a17694ce33561a
 SHA512:
-  metadata.gz: 70ba27017719f0c4a1f0a384d2b1c90ccf3afbd753c712ff1e72b5d26a4696a811b4510ff41712107def86a08835d7e558e59a0f3e4e9e323804932251a142e7
-  data.tar.gz: 8406f62ad439bc9b075519f0b4be068408bf7ddd315b538b0ac9316ce2e6c33e3c135e59460604e2351edb236923f37e076c063c5b9c1d57bef60a21bb354d6c
+  metadata.gz: 12dcd547fc39f2f46300b4effc16653234444e172cc021c23fc6bd543088dd2d3cfe54a232f7f4b0fe8960d9cb646627143d58b8b6fed389ef1a222c8af5daa6
+  data.tar.gz: e2e1ac68aa439389b97ad59c230a6eb673971ce914fb99070a712b6d96ef82b245a7ee6012b77378b55e53d7bf8706a804a438de52e0c5fa371902138131d409

data/lib/xlogin/factory.rb

@@ -11,7 +11,6 @@ module Xlogin
     def initialize
       @inventory    = Hash.new
       @templates    = Hash.new
-      @session_pool = Hash.new
     end
 
     def set_inventory(name, **opts)
@@ -59,14 +58,7 @@ module Xlogin
     end
 
     def build_pool(args, **opts)
-      uri = case args
-            when Hash   then uri(args)
-            when String then uri(get_inventory(args))
-            else return
-            end
-
-      param = opts.map { |k, v| "#{k}=#{v}" }.join('&')
-      @session_pool["#{uri}?#{param}"] ||= Xlogin::SessionPool.new(args, **opts)
+      Xlogin::SessionPool.new(args, **opts)
     end
 
     def build_from_hostname(args, **opts)

data/lib/xlogin/session.rb

@@ -76,7 +76,11 @@ module Xlogin
           next if logger.nil? || [$stdout, $stderr].include?(logger)
           logger.close
         end
-        @gateway.shutdown! if @gateway
+
+        if @gateway
+          @gateway.close(@port)
+          @gateway.shutdown!
+        end
 
         super
       end

data/lib/xlogin/session_pool.rb

@@ -32,9 +32,9 @@ module Xlogin
     def with
       session = deq
       begin
-        session.prompt # confirm that the session is still alive
+        raise IOError if session.sock.closed?
       rescue IOError, EOFError, Errno::ECONNABORTED, Errno::ECONNREFUSED, Errno::ECONNRESET
-        destroy session
+        destroy(session)
         session = deq
       end
 
@@ -46,7 +46,7 @@ module Xlogin
     def close
       while @queue.empty?
         session, _, _ = @queue.deq
-        destroy session
+        destroy(session)
       end
     end
 
@@ -61,18 +61,17 @@ module Xlogin
 
       session, created, cleaner = @queue.deq
       if Time.now - created > @idle
-        destroy session
+        destroy(session)
         return deq
       end
 
-      cleaner.kill
       session
     end
 
     def enq(session)
       created = Time.now
       cleaner = Thread.new(session) do |s|
-        sleep @idle * 2
+        sleep @idle * 1.5
         s.close rescue nil
       end
 

data/lib/xlogin/version.rb

@@ -1,3 +1,3 @@
 module Xlogin
-	VERSION = "0.11.8"
+	VERSION = "0.11.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xlogin
 version: !ruby/object:Gem::Version
-  version: 0.11.8
+  version: 0.11.9
 platform: ruby
 authors:
 - haccht
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-12 00:00:00.000000000 Z
+date: 2019-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-telnet