mark clear_thread! protected and remove api client from @tenant_threa…

…dsafe
bigcommerce · Sep 17, 2015 · 126bc0a · 126bc0a
1 parent b7e46ca
commit 126bc0a
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/lib/bigcommerce.rb b/lib/bigcommerce.rb
@@ -60,17 +60,14 @@ def configure_threadsafe(config, &_block)
 
     ensure
       # Make sure we don't leak memory
+      @tenant_threadsafe.delete(tenant)
       clear_thread!
     end
 
     def api
       @tenant_single_thread || @tenant_threadsafe[tenant]
     end
 
-    def clear_thread!
-      self.tenant = nil
-    end
-
     def build_url(config)
       return config.url if config.auth == 'legacy'
 
@@ -96,6 +93,11 @@ def build_client(config)
       end
     end
 
+    def clear_thread!
+      @tenant_threadsafe[tenant]
+      self.tenant = nil
+    end
+
     def tenant
       Thread.current[:bc_api_tenant]
     end