manticore 0.5.3-java → 0.5.4-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce9ff3f2e0cbcfbf063b0d336dd4a8d686c440a0
-  data.tar.gz: d32fd7d9c65b4dc04b3b587cbdcd9620ad8ccf38
+  metadata.gz: 40995659e9b7257957446803d3e19d4ff633fa58
+  data.tar.gz: 351c5343d32e1944663d5c796bc221ef3b2453b6
 SHA512:
-  metadata.gz: e4576e022aad9f9a9f44d7eb6f19f0497ecce5d6327edf6c979c09f9d11b627f46645949a29b1b359c8f91d804194339868f2d46d0657b09d65843471585536c
-  data.tar.gz: 5dd8570bf15e2fa83f0c8c20aeeca149da695179c1307a041f38e047976690c718820e153f6b7bff55eb7c7a47c3ae9822992243c546e2ac584271f6efcd74bd
+  metadata.gz: 025f7f1769aa67b0edb3bb567be722df970d827d6060802c992b09f24672cc839f74f3a2e7a37aa5cb76ec2ce1e7437dc47c667f2be8b89c666040ed68c1e563
+  data.tar.gz: 861b575e15e8a10a6f072495472e693541c7576e172e665320b807a190f50ed95279cb77c92bf2ecd1ce77a2cc433d85132f18d2c8a36452eb8607d6690b90a1

data/lib/manticore/client.rb

@@ -161,6 +161,9 @@ module Manticore
     # @option options [boolean]         ssl[:track_state]         (false)      Turn on or off connection state tracking. This helps prevent SSL information from leaking across threads, but means that connections
     #                                                                             can't be shared across those threads. This should generally be left off unless you know what you're doing.
     def initialize(options = {})
+      @finalizers = []
+      self.class.shutdown_on_finalize self, @finalizers
+
       builder  = client_builder
       builder.set_user_agent options.fetch(:user_agent, "Manticore #{VERSION}")
       @options = options
@@ -338,8 +341,21 @@ module Manticore
       @executor
     end
 
+    def self.shutdown_on_finalize(client, objs)
+      ObjectSpace.define_finalizer client, -> {
+        objs.each {|obj, args| obj.send(*args) rescue nil }
+      }
+    end
+
     protected
 
+    # Takes an object and a message to pass to the object to destroy it. This is done rather than
+    # a proc to avoid creating a closure that would maintain a reference to this client, which
+    # would prevent the client from being cleaned up.
+    def finalize(object, args)
+      @finalizers << [object, Array(args)]
+    end
+
     def url_as_regex(url)
       if url.is_a?(String)
         %r{^#{Regexp.escape url}$}
@@ -373,7 +389,7 @@ module Manticore
           cm.set_validate_after_inactivity options.fetch(:check_connection_timeout, 2_000)
           cm.set_default_max_per_route options.fetch(:pool_max_per_route, @max_pool_size)
           cm.set_max_total @max_pool_size
-          at_exit { cm.shutdown }
+          finalize cm, :shutdown
         end
       end
     end
@@ -381,7 +397,7 @@ module Manticore
     def create_executor_if_needed
       return @executor if @executor
       @executor = Executors.new_cached_thread_pool
-      at_exit { @executor.shutdown }
+      finalize @executor, :shutdown
     end
 
     def request(klass, url, options, &block)

data/lib/manticore/version.rb

@@ -1,3 +1,3 @@
 module Manticore
-  VERSION = "0.5.3"
+  VERSION = "0.5.4"
 end

metadata

@@ -1,36 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: manticore
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: java
 authors:
 - Chris Heald
 autorequire:
 bindir: bin
-cert_chain:
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIDaDCCAlCgAwIBAgIBATANBgkqhkiG9w0BAQUFADA9MQ8wDQYDVQQDDAZjaGVh
-  bGQxFTATBgoJkiaJk/IsZAEZFgVnbWFpbDETMBEGCgmSJomT8ixkARkWA2NvbTAe
-  Fw0xNTAzMDQwNTA5MjhaFw0xNjAzMDMwNTA5MjhaMD0xDzANBgNVBAMMBmNoZWFs
-  ZDEVMBMGCgmSJomT8ixkARkWBWdtYWlsMRMwEQYKCZImiZPyLGQBGRYDY29tMIIB
-  IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwcnX2yl+rbjUztC4V+iUJgWv
-  NPxqU4bQBaL+w00wVABWr04Hjg+cEkqiJ6A0kXxZIz5uXKhhvsaO50NvHfplVcUf
-  BxQabIfCS79xdvexXN0or3F5saatGaGa4cj/0uUHjX7w+K5MpEVfbjJp0uAKp62B
-  wUU2ilmn7EvZhEUPOMQi01t8z8OsOGc8kF2UtU1kGCxLV7eThWqu8CdXrux5E140
-  7SnFnPlnXNeHqwZdOMZzQ9PiTQAPCKO3AY0aBFQeG3wlFPqkcEjOrtV1h7werUwz
-  aNb4t5sAuu0f/9B646BOjiMgj1WeUlhgiAsaF5kVvLFNCxwS/xpcN3X01M2KdQID
-  AQABo3MwcTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUtFVpwfEG
-  78mBd2ulzsS+SlffdOcwGwYDVR0RBBQwEoEQY2hlYWxkQGdtYWlsLmNvbTAbBgNV
-  HRIEFDASgRBjaGVhbGRAZ21haWwuY29tMA0GCSqGSIb3DQEBBQUAA4IBAQApPK7H
-  4nM6IAzpeA1fYuBsH+Z7ENr2p02ElinUVZMiUmWsFjoZqDLWDWIHJnlJCwUZjnBb
-  gXpEFiKiS9XgkRmIOIb3fpD9M574vo/AyvAzvQHLCN7p86IFWQSTsAQptcPfQBL7
-  8yWPlXfbX6qxnLHrkjcSnRo61v4NqU+y6x4WEX6Dp90DK3mNLgk7kQk4GhBXevnV
-  4Mmxp+JAtISoamMfjldbJhCMkWaZUwDsdFzSfTXl7yg772IYZfICzD7eENPiIcmu
-  cnyabLOcGIKZNxvnSfwOuCBnjgoSOyJi/n48n1s+OPB/OmPJoWmhKu2DO4sUb4+K
-  /3Mhp5UWSl9SmDR1
-  -----END CERTIFICATE-----
-date: 2016-02-23 00:00:00.000000000 Z
+cert_chain: []
+date: 2016-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement

metadata.gz.sig

@@ -1 +0,0 @@
-q[d�J�M,�������:�=X�2E6