xlogin 0.7.14 → 0.7.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fdd4ee47fc2ae343363a8074944dbaf7d624c430
-  data.tar.gz: d50197fa6e9fec8b0f79fb32f3f1ca00153a53a8
+  metadata.gz: c724426e5a7a390655bde1100323aa82b3e7189e
+  data.tar.gz: 2e1f06d01d84439fdbce0acd48487d1ffb6fec6d
 SHA512:
-  metadata.gz: de383fcdbe2573f505563ac729579a954b83321cf7285693b6446df6a7b9d43d2f7d87d925fd01fa7158e4dfee8e9d58c248ed6b9f6a362512e0fd57111370ea
-  data.tar.gz: 924e67dc76b0b414b2e402ec6890028e0d37e0b5a65f132b761bcc0761a9f9750490b3b8df4c54cbd8a916b019a399782d650feef2739ca7199b4468fd1c3195
+  metadata.gz: a878236af348f8b765472712079c09dc7847d6db5a0521c1913edd62fb4efd63cd24411386b320912c24ed504a56acf1b8a3267db8ba2c4ef2f63abf8869a234
+  data.tar.gz: 6d48c122220ce879f30933a866773b9d2bd0879059cca7ea0419f7cb9b6aef6a08d6680f0e5629f8a44689e1efd4c0e85d1e6199775379e340c44908f325e6b8

data/lib/xlogin.rb

@@ -54,7 +54,13 @@ module Xlogin
       factory.source(source_file || DEFAULT_INVENTORY_FILE)
     end
 
-    def template(*template_files)
+    def template(*template_dirs)
+      files = template_dirs.flat_map { |dir| Dir.glob(File.join(dir, '*.rb')) }
+      load_template(*files)
+    end
+    alias_method :template_dir, :template
+
+    def load_template(*template_files)
       return factory.source_template(*template_files) unless template_files.empty?
 
       unless Dir.exist?(DEFAULT_TEMPLATE_DIR)
@@ -64,11 +70,6 @@ module Xlogin
       template_dir(DEFAULT_TEMPLATE_DIR)
     end
 
-    def template_dir(*template_dirs)
-      files = template_dirs.flat_map { |dir| Dir.glob(File.join(dir, '*.rb')) }
-      template(*files)
-    end
-
   end
 
 end

data/lib/xlogin/factory.rb

@@ -10,7 +10,6 @@ module Xlogin
     def initialize
       @database  = Hash.new
       @templates = Hash.new
-      @mutex     = Mutex.new
       @group     = nil
     end
 
@@ -68,15 +67,11 @@ module Xlogin
     end
 
     def build(type:, uri:, **opts)
-      @mutex.synchronize { Xlogin.configure { template_dir } if @templates.empty? }
-
       template = get_template(type)
       template.build(uri, **opts)
     end
 
     def build_from_hostname(hostname, **opts)
-      @mutex.synchronize { Xlogin.configure { source } if @database.empty? }
-
       hostinfo = get(hostname)
       raise Xlogin::SessionError.new("Host not found: '#{hostname}'") unless hostinfo
 

data/lib/xlogin/session.rb

@@ -20,7 +20,7 @@ module Xlogin
                 when 'telnet' then 23
                 end
 
-      raise ArgumentError.new("Invalid URI - '#{uri}'") unless @host && @port
+      raise SessionError.new("Invalid URI - '#{uri}'") unless @host && @port
 
       @name     = opts.delete(:name) || @host
       @config   = OpenStruct.new(opts)

data/lib/xlogin/session_pool.rb

@@ -5,15 +5,17 @@ module Xlogin
   class SessionPool
 
     DEFAULT_SIZE = 1
-    DEFAULT_IDLE = 10
+    DEFAULT_IDLE = false
 
     def initialize(args, **opts)
-      @args = args
-      @opts = opts
+      @args  = args
+      @opts  = opts
 
-      @mutex   = Mutex.new
-      @queue   = Queue.new
-      @created = 0
+      @mutex = Mutex.new
+      @queue = Queue.new
+
+      @created  = 0
+      @watchdog = Hash.new
     end
 
     def size
@@ -43,27 +45,36 @@ module Xlogin
     def deq
       session = try_create
       unless session
-        session, expires = @queue.deq
-        if expires < Time.now
-          session.close
-          session = session.duplicate
-        end
+        session, updated = @queue.deq
+        session = session.duplicate if idle && updated + idle.to_f < Time.now
       end
 
       session
     end
 
     def enq(session)
-      @queue.enq [session, Time.now + idle]
+      @mutex.synchronize { update_watchdog(session) }
+      @queue.enq [session, Time.now]
     end
 
     def try_create
       @mutex.synchronize do
         return unless @created < size
 
+        session = Xlogin.get(@args, **@opts)
+        update_watchdog(session)
+
         @created += 1
-        Xlogin.get(@args, **@opts)
+        session
       end
     end
+
+    def update_watchdog(session)
+      return unless idle
+
+      @watchdog[session].tap { |th| th.kill if th }
+      @watchdog[session] = Thread.new(session) { |s| sleep(idle.to_f + 1) && s.close }
+    end
   end
+
 end

data/lib/xlogin/version.rb

@@ -1,3 +1,3 @@
 module Xlogin
-  VERSION = "0.7.14"
+  VERSION = "0.7.16"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xlogin
 version: !ruby/object:Gem::Version
-  version: 0.7.14
+  version: 0.7.16
 platform: ruby
 authors:
 - haccht
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-14 00:00:00.000000000 Z
+date: 2018-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-telnet