xlogin 0.9.7 → 0.9.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec297c1795e189edc5d9076dfad133d6392f48b1
-  data.tar.gz: c4c83473643e46652a1f0e49d9bbc00b123f8a08
+  metadata.gz: 28cb6da4487ca47b89f51e47062381da8fa717f7
+  data.tar.gz: 025f251c6b0faaee4cb65efb0331f0cba384f70d
 SHA512:
-  metadata.gz: 60144799caaba76aae2b0c3ed47639bd684fb25cb6cd73c2359f8e95ba5dd83c0539ce670f4ca9f9eb42ee27c0aab095a710e18a1918eb1e698d8a9ea937406b
-  data.tar.gz: 841017f024966f85a95292ad78fc68fd0281ff39256b95395af26da4c326d182c8f82b834a18310104d9523fe5d2cbc3ac467208eca9a0766e6759f1b40b25cf
+  metadata.gz: 99e938853de8d38f268f2b78472078b92b78306c8284ca87ae43923fb4ae06f10674965827b8da20268dd95b69c36d22b7200c13444f3c4934748f74cedc0c2f
+  data.tar.gz: e0eda12bcc603852a8342fb5cfbdc08b2483db4a15d01c06eec6f222cfd1ad3697c90ce2a5ef0c608a0745c364ae0a67ebf94025445f5ec514eb5657a837a3eb

data/lib/xlogin/cli.rb

@@ -66,9 +66,9 @@ module Xlogin
 
         config.hostlist  = Xlogin.list(*host.to_s.split(/\s+/))
         raise "No host found: `#{host}`" if config.hostlist.empty?
-      #rescue => e
-      # $stderr.puts e, '', parser
-      # exit 1
+      rescue => e
+        $stderr.puts e, '', parser
+        exit 1
       end
 
       config

data/lib/xlogin/session.rb

@@ -84,7 +84,7 @@ module Xlogin
     end
 
     def enable_log(log = $stdout)
-      @loggers.update(log => build_loggers(log))
+      @loggers.update(log => build_logger(log))
       if block_given?
         yield
         disable_log(log)

data/lib/xlogin/session_pool.rb

@@ -5,29 +5,32 @@ module Xlogin
   class SessionPool
 
     DEFAULT_POOL_SIZE = 1
+    DEFAULT_POOL_IDLE = 60
 
     def initialize(args, **opts)
       @args = args
       @opts = opts
-      @size = case @args
-              when String then @opts.delete(:pool_size) || DEFAULT_POOL_SIZE
-              when Hash   then @args.delete(:pool_size) || DEFAULT_POOL_SIZE
-              end
+
+      case @args
+      when String
+        @size = @opts.delete(:pool_size) || DEFAULT_POOL_SIZE
+        @idle = @opts.delete(:pool_idle) || DEFAULT_POOL_IDLE
+      when Hash
+        @size = @args.delete(:pool_size) || DEFAULT_POOL_SIZE
+        @idle = @args.delete(:pool_idle) || DEFAULT_POOL_IDLE
+      end
 
       @mutex = Mutex.new
       @queue = Queue.new
-
       @created  = 0
     end
 
     def with
       session = deq
-
       begin
         session.prompt
       rescue IOError, EOFError, Errno::ECONNABORTED, Errno::ECONNREFUSED, Errno::ECONNRESET
-        session.close rescue nil
-        @created -= 1
+        destroy session
         session = try_create
       end
 
@@ -36,15 +39,29 @@ module Xlogin
       enq session
     end
 
+    def close
+      while @queue.empty?
+        session, _ = @queue.deq
+        destroy session
+      end
+    end
+
     private
     def deq
-      session = try_create
-      session = @queue.deq unless session
+      unless session = try_create
+        session, timer = @queue.deq
+        timer.kill
+      end
       session
     end
 
     def enq(session)
-      @queue.enq session
+      timer = Thread.new do
+        sleep @idle * 1.2
+        session.close rescue nil
+      end
+
+      @queue.enq [session, timer]
     end
 
     def try_create
@@ -56,6 +73,13 @@ module Xlogin
       end
     end
 
+    def destroy(session)
+      @mutex.synchronize do
+        session.close rescue nil
+        @created -= 1
+      end
+    end
+
   end
 
 end

data/lib/xlogin/version.rb

@@ -1,3 +1,3 @@
 module Xlogin
-  VERSION = "0.9.7"
+  VERSION = "0.9.11"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xlogin
 version: !ruby/object:Gem::Version
-  version: 0.9.7
+  version: 0.9.11
 platform: ruby
 authors:
 - haccht
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-29 00:00:00.000000000 Z
+date: 2018-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-telnet