xlogin 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01f1dcfc4664204170ef0065396788768d5ac676
-  data.tar.gz: a4bf5740a6ca77b67a64497b7cded0942e689f9e
+  metadata.gz: db3b8cd353f6a89b6ed68d91938792373cfc5736
+  data.tar.gz: 7e0a77c42f1eadd89005b753159cf92f53553a1a
 SHA512:
-  metadata.gz: e8bf704c7af2aef3f090951d94088d8ec49c985eff1226333be5d540a0171e1022efdb7cad142c5642d11024418c91d0e695f7c01d0dac4f388454433f550706
-  data.tar.gz: fc21595ec2a4acb907eb9f6dfd77154f3097b8afff7e7e21fd1548e8ca14d617e183a0bd7f56de3238006975f588f2f3a43ca2c4d62216c71c0d513ac233be68
+  metadata.gz: c40fa0be1ae038ce25114eaec6e435fec55290190edeaffabf2e8d3fff65c79a78494ba9efb94b4b7253906d32aefa0bc9649bdb69416e77f63480e948df913d
+  data.tar.gz: 929b4ebc925e83d8cc0d8600162be6821ef420beb69b7dbc847a529c67987ab697acdf02042100bb3afabdc63392625efee4467b699c4dc231dc81932d27464b

data/lib/xlogin/session.rb

@@ -1,3 +1,5 @@
+require 'thread'
+require 'timeout'
 require 'stringio'
 
 module Xlogin
@@ -18,24 +20,29 @@ module Xlogin
 
       @loglist  = [@opts[:log]].flatten.compact
       @logger   = update_logger
+
+      @mutex    = Mutex.new
     end
 
-    def thread_safe(timeout: @timeout, maximum_retry: 1)
-      @safe_session = self
-      @safe_session_mutex ||= Mutex.new
+    def lock(timeout: @timeout, max_retry: 1)
+      session_granted = false
+
+      begin
+        Timeout.timeout(timeout) { @mutex.lock }
+        retry_count     = 0
+        safe_session    = self
+        session_granted = true
 
-      Timeout.timeout(timeout) do
-        @safe_session_mutex.synchronize do
-          retry_count = 0
-          begin
-            @safe_session ||= Xlogin.get(@host, @opts)
-            yield @safe_session
-          rescue Errno::ECONNRESET => e
-            raise e unless (retry_count += 1) < maximum_retry
-            @safe_session = nil
-            retry
-          end
+        begin
+          safe_session ||= Xlogin.get(@host, @opts)
+          yield safe_session
+        rescue Errno::ECONNRESET => e
+          raise e unless (retry_count += 1) < max_retry
+          safe_session = nil
+          retry
         end
+      ensure
+        @mutex.unlock if @mutex.locked? && session_granted
       end
     end
 

data/lib/xlogin/version.rb

@@ -1,3 +1,3 @@
 module Xlogin
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xlogin
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - haccht
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-12 00:00:00.000000000 Z
+date: 2017-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler