radiator 0.3.11 → 0.3.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad2c2c627c82f4b7a77eba148cb884e274c704a6
-  data.tar.gz: '0308a2266cbf4a54ef069d66ce22579aedba05ef'
+  metadata.gz: 5c1c1462b5782d4dbdc1611cb6e3fa2977041aa2
+  data.tar.gz: '068894ae4633baddca507d426a8c9d0069569219'
 SHA512:
-  metadata.gz: a6ef349ae2137e72426b98bb2c15528066689250f5b4fa1cd3f2a38da4a2db8c7ec770c2560c6275dfc4d096477d33d4e100c69b2b8a4a290035834f5d45cbc6
-  data.tar.gz: d84a08d33554048527c224655f91646c61a9a36ef7151071c77ea4b3e5f11eca858e182b283078d274b309317e109b13aa18d122b50eeb0d4e6021da0ad20b8f
+  metadata.gz: a88b0789b7181d0ea3190bb31f317a23d11c0b914005b163a456675fad137a533084fafacfdd24fb17f107a203e5ea68486af56d7301fbcd51be4ca1d5f8ab33
+  data.tar.gz: f294d130a832f32d5423ccd4d2dff2aee2f71e7e8b44e38c774461d633d5e184fac71351d031496ba653d9cba621d54677741469ecbc26bf565828d7ab2ae903

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    radiator (0.3.11)
+    radiator (0.3.12)
       awesome_print (~> 1.7, >= 1.7.0)
       bitcoin-ruby (~> 0.0, >= 0.0.11)
       ffi (~> 1.9, >= 1.9.18)

data/lib/radiator/api.rb

@@ -519,6 +519,22 @@ module Radiator
       
       "#<#{self.class.name} [#{properties}]>"
     end
+    
+    def stopped?
+      http_active = if @http_memo.nil?
+        false
+      else
+        @http_memo.values.map do |http|
+          if defined?(http.active?)
+            http.active?
+          else
+            false
+          end
+        end.include?(true)
+      end
+      
+      @uri.nil? && @http_id.nil? && !http_active && @api.nil? && @block_api.nil?
+    end
   private
     def self.methods_json_path
       @methods_json_path ||= "#{File.dirname(__FILE__)}/methods.json"
@@ -759,7 +775,7 @@ module Radiator
       
       @backoff_sleep *= 2
       sleep @backoff_sleep
-      
+    ensure
       if !!@backoff_at && Time.now.utc - @backoff_at > 300
         @backoff_at = nil 
         @backoff_sleep = nil

data/lib/radiator/transaction.rb

@@ -47,7 +47,14 @@ module Radiator
       @expiration ||= nil
       @immutable_expiration = !!@expiration
       
-      options = options.merge(url: @url, chain: @chain)
+      options = options.merge(
+        url: @url,
+        chain: @chain,
+        pool_size: 1,
+        persist: false,
+        reuse_ssl_sessions: false
+      )
+      
       @api = Api.new(options)
       @network_broadcast_api = NetworkBroadcastApi.new(options)
       
@@ -94,6 +101,8 @@ module Radiator
       else
         self
       end
+    ensure
+      shutdown
     end
     
     def operations
@@ -108,6 +117,11 @@ module Radiator
     def operations=(operations)
       @operations = operations
     end
+    
+    def shutdown
+      @api.shutdown if !!@api
+      @network_broadcast_api.shutdown if !!@network_broadcast_api
+    end
   private
     def payload
       @payload ||= {
@@ -230,13 +244,13 @@ module Radiator
     
     def self.finalize(api, network_broadcast_api)
       proc {
-        if !!api
+        if !!api && !api.stopped?
           puts "DESTROY: #{api.inspect}" if ENV['LOG'] == 'TRACE'
           api.shutdown
           api = nil
         end
         
-        if !!network_broadcast_api
+        if !!network_broadcast_api && !network_broadcast_api.stopped?
           puts "DESTROY: #{network_broadcast_api.inspect}" if ENV['LOG'] == 'TRACE'
           network_broadcast_api.shutdown
           network_broadcast_api = nil

data/lib/radiator/version.rb

@@ -1,4 +1,4 @@
 module Radiator
-  VERSION = '0.3.11'
+  VERSION = '0.3.12'
   AGENT_ID = "radiator/#{VERSION}"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: radiator
 version: !ruby/object:Gem::Version
-  version: 0.3.11
+  version: 0.3.12
 platform: ruby
 authors:
 - Anthony Martin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-02 00:00:00.000000000 Z
+date: 2017-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler