lib/berkshelf/source.rb in berkshelf-5.0.0 vs lib/berkshelf/source.rb in berkshelf-5.1.0

@@ -15,16 +15,21 @@
     def api_client
       @api_client ||= begin
                         if source == :chef_server
                           APIClient.chef_server(
                             ssl: {verify: Berkshelf::Config.instance.ssl.verify},
+                            timeout: api_timeout,
+                            open_timeout: [(api_timeout / 10), 3].max,
                             client_name: Berkshelf::Config.instance.chef.node_name,
                             server_url: Berkshelf::Config.instance.chef.chef_server_url,
                             client_key: Berkshelf::Config.instance.chef.client_key,
                           )
                         else
-                          APIClient.new(uri, ssl: {verify: Berkshelf::Config.instance.ssl.verify})
+                          APIClient.new(uri,
+                                        timeout: api_timeout,
+                                        open_timeout: [(api_timeout / 10), 3].max,
+                                        ssl: {verify: Berkshelf::Config.instance.ssl.verify})
                         end
                       end
     end
 
     def uri
@@ -115,7 +120,12 @@
     def ==(other)
       return false unless other.is_a?(self.class)
       uri == other.uri
     end
 
+    private
+
+    def api_timeout
+      Berkshelf::Config.instance.api.timeout.to_i
+    end
   end
 end