xlogin 0.7.13 → 0.7.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c34a45b0c1d699483f3fd9fa15b04b0a8c27ec9d
-  data.tar.gz: 86834cd8ef3c915d35db00dc4e29fc819686ffd2
+  metadata.gz: fdd4ee47fc2ae343363a8074944dbaf7d624c430
+  data.tar.gz: d50197fa6e9fec8b0f79fb32f3f1ca00153a53a8
 SHA512:
-  metadata.gz: 38c20b0e67d461bc4e10bf8c3aab9af8975f470a27a2ed325b10b0215b6433ac4aa299f6b43b1b5e2160445ab075d277602f54eaebfc71f31ebdba138614124f
-  data.tar.gz: 114dfeab619cdf87ab1207b22e14bbae82718d9ca82531ae9236819ae481af414cbcf6d02da3c015ec16c6590c9e5c4bf88b5d6062a479831fd8b3f9a1b25848
+  metadata.gz: de383fcdbe2573f505563ac729579a954b83321cf7285693b6446df6a7b9d43d2f7d87d925fd01fa7158e4dfee8e9d58c248ed6b9f6a362512e0fd57111370ea
+  data.tar.gz: 924e67dc76b0b414b2e402ec6890028e0d37e0b5a65f132b761bcc0761a9f9750490b3b8df4c54cbd8a916b019a399782d650feef2739ca7199b4468fd1c3195

data/lib/xlogin.rb

@@ -1,6 +1,7 @@
 $:.unshift File.dirname(__FILE__)
 
 require 'xlogin/factory'
+require 'xlogin/session_pool'
 require 'xlogin/version'
 
 module Xlogin
@@ -30,7 +31,7 @@ module Xlogin
     end
 
     def get_pool(args, **opts, &block)
-      pool = factory.pool(args, **opts)
+      pool = Xlogin::SessionPool.new(args, **opts)
 
       return pool unless block
       block.call(pool)

data/lib/xlogin/factory.rb

@@ -1,4 +1,5 @@
 require 'singleton'
+require 'thread'
 require 'xlogin/template'
 
 module Xlogin
@@ -9,6 +10,7 @@ module Xlogin
     def initialize
       @database  = Hash.new
       @templates = Hash.new
+      @mutex     = Mutex.new
       @group     = nil
     end
 
@@ -65,16 +67,16 @@ module Xlogin
       @group = current_group
     end
 
-    def pool(args, **opts)
-      SessionPool.new(args, **opts)
-    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

@@ -1,4 +1,3 @@
-require 'connection_pool'
 require 'delegate'
 require 'fileutils'
 require 'net/ssh/gateway'
@@ -165,49 +164,4 @@ module Xlogin
       end
     end
   end
-
-  class SessionPool
-
-    def initialize(args, **opts)
-      pool_opts = case args
-                  when String then opts.select { |k, v| %i(size timeout).member?(k) && !v.nil? }
-                  when Hash   then args.select { |k, v| %i(size timeout).member?(k) && !v.nil? }
-                  end
-
-      @pool = ConnectionPool.new(**pool_opts) { Wrapper.new(args, **opts) }
-    end
-
-    def with(**opts)
-      @pool.with(**opts) do |session|
-        session.repair if session.closed?
-        session.aging_time(opts[:aging]) if opts[:aging]
-
-        yield session
-      end
-    end
-
-    class Wrapper
-      def initialize(*args)
-        @session = Xlogin.get(*args)
-        @agetime = nil
-      end
-
-      def repair
-        @session = @session.duplicate
-      end
-
-      def aging_time(time = @session.config.timeout)
-        @agetime = Time.now + time
-        Thread.start do
-          sleep(time)
-          @session.close if Time.now > @agetime
-        end
-      end
-
-      def method_missing(name, *args, &block)
-        @session.send(name, *args, &block)
-      end
-    end
-
-  end
 end

data/lib/xlogin/session_pool.rb

@@ -0,0 +1,69 @@
+require 'thread'
+
+module Xlogin
+
+  class SessionPool
+
+    DEFAULT_SIZE = 1
+    DEFAULT_IDLE = 10
+
+    def initialize(args, **opts)
+      @args = args
+      @opts = opts
+
+      @mutex   = Mutex.new
+      @queue   = Queue.new
+      @created = 0
+    end
+
+    def size
+      case @args
+      when String then @opts[:size] || DEFAULT_SIZE
+      when Hash   then @args[:size] || DEFAULT_SIZE
+      end
+    end
+
+    def idle
+      case @args
+      when String then @opts[:idle] || DEFAULT_IDLE
+      when Hash   then @args[:idle] || DEFAULT_IDLE
+      end
+    end
+
+    def with
+      session = deq
+      begin
+        Thread.handle_interrupt(Exception => :immediate) { yield session }
+      ensure
+        enq(session)
+      end
+    end
+
+    private
+    def deq
+      session = try_create
+      unless session
+        session, expires = @queue.deq
+        if expires < Time.now
+          session.close
+          session = session.duplicate
+        end
+      end
+
+      session
+    end
+
+    def enq(session)
+      @queue.enq [session, Time.now + idle]
+    end
+
+    def try_create
+      @mutex.synchronize do
+        return unless @created < size
+
+        @created += 1
+        Xlogin.get(@args, **@opts)
+      end
+    end
+  end
+end

data/lib/xlogin/version.rb

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

data/xlogin.gemspec

@@ -35,7 +35,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency "net-ssh-telnet"
   spec.add_dependency "net-ssh-gateway"
   spec.add_dependency "parallel"
-  spec.add_dependency "connection_pool"
 
   spec.add_development_dependency "bundler", "~> 1.13"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xlogin
 version: !ruby/object:Gem::Version
-  version: 0.7.13
+  version: 0.7.14
 platform: ruby
 authors:
 - haccht
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-08 00:00:00.000000000 Z
+date: 2018-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-telnet
@@ -80,20 +80,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: connection_pool
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -147,6 +133,7 @@ files:
 - lib/xlogin/factory.rb
 - lib/xlogin/rake_task.rb
 - lib/xlogin/session.rb
+- lib/xlogin/session_pool.rb
 - lib/xlogin/ssh.rb
 - lib/xlogin/telnet.rb
 - lib/xlogin/template.rb