diff options
Diffstat (limited to 'lib/chef/chef_fs/file_system/chef_server/nodes_dir.rb')
| -rw-r--r-- | lib/chef/chef_fs/file_system/chef_server/nodes_dir.rb | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/lib/chef/chef_fs/file_system/chef_server/nodes_dir.rb b/lib/chef/chef_fs/file_system/chef_server/nodes_dir.rb index df2388f1df..c81e880744 100644 --- a/lib/chef/chef_fs/file_system/chef_server/nodes_dir.rb +++ b/lib/chef/chef_fs/file_system/chef_server/nodes_dir.rb @@ -28,18 +28,16 @@ class Chef class NodesDir < RestListDir # Identical to RestListDir.children, except supports environments def children - begin - @children ||= root.get_json(env_api_path).keys.sort.map do |key| - make_child_entry(key, true) - end - rescue Timeout::Error => e - raise Chef::ChefFS::FileSystem::OperationFailedError.new(:children, self, e, "Timeout retrieving children: #{e}") - rescue Net::HTTPServerException => e - if $!.response.code == "404" - raise Chef::ChefFS::FileSystem::NotFoundError.new(self, $!) - else - raise Chef::ChefFS::FileSystem::OperationFailedError.new(:children, self, e, "HTTP error retrieving children: #{e}") - end + @children ||= root.get_json(env_api_path).keys.sort.map do |key| + make_child_entry(key, true) + end + rescue Timeout::Error => e + raise Chef::ChefFS::FileSystem::OperationFailedError.new(:children, self, e, "Timeout retrieving children: #{e}") + rescue Net::HTTPServerException => e + if $!.response.code == "404" + raise Chef::ChefFS::FileSystem::NotFoundError.new(self, $!) + else + raise Chef::ChefFS::FileSystem::OperationFailedError.new(:children, self, e, "HTTP error retrieving children: #{e}") end end |