chef 0.10.0.beta.10 → 0.10.0.qs.0

data/lib/chef/rest.rb

@@ -304,13 +304,17 @@ class Chef
           retry
         end
         raise Timeout::Error, "Timeout connecting to #{url.host}:#{url.port} for #{rest_request.path}, giving up"
-      rescue Net::HTTPFatalError => e
-        if http_retry_count - http_attempts + 1 > 0
-          sleep_time = 1 + (2 ** http_attempts) + rand(2 ** http_attempts)
-          Chef::Log.error("Server returned error for #{url}, retrying #{http_attempts}/#{http_retry_count} in #{sleep_time}s")
-          sleep(sleep_time)
-          retry
+      rescue Net::HTTPFatalError, Net::HTTPServerException => e
+        if (e.kind_of?(Net::HTTPFatalError)) || (e.kind_of?(Net::HTTPServerException) && e.response.code == "403")
+          if http_retry_count - http_attempts + 1 > 0
+            sleep_time = 1 + (2 ** http_attempts) + rand(2 ** http_attempts)
+            Chef::Log.error("Server returned error for #{url}, retrying #{http_attempts}/#{http_retry_count} in #{sleep_time}s")
+            sleep(sleep_time)
+            retry
+          end
         end
+        # mutate the error message so it contains useful info
+        e.message << " url: #{url}"
         raise
       end
     end

data/lib/chef/shell_out.rb

@@ -40,7 +40,7 @@ class Chef
   class ShellOut
     READ_WAIT_TIME = 0.01
     READ_SIZE = 4096
-    DEFAULT_READ_TIMEOUT = 60
+    DEFAULT_READ_TIMEOUT = 600
     DEFAULT_ENVIRONMENT = {'LC_ALL' => 'C'}
 
     if RUBY_PLATFORM =~ /mswin|mingw32|windows/

data/lib/chef/solr_query.rb

@@ -152,7 +152,7 @@ class Chef
       delete_database(db)
 
       results = {}
-      [Chef::ApiClient, Chef::Node, Chef::Role].each do |klass|
+      [Chef::ApiClient, Chef::Node, Chef::Role, Chef::Environment].each do |klass|
         results[klass.name] = reindex_all(klass) ? "success" : "failed"
       end
       databags = Chef::DataBag.cdb_list(true)

data/lib/chef/version.rb

@@ -17,7 +17,7 @@
 
 class Chef
   CHEF_ROOT = File.dirname(File.expand_path(File.dirname(__FILE__)))
-  VERSION = '0.10.0.beta.10'
+  VERSION = '0.10.0'
 end
 
 # NOTE: the Chef::Version class is defined in version_class.rb

metadata

@@ -2,7 +2,7 @@
 name: chef
 version: !ruby/object:Gem::Version 
   prerelease: 7
-  version: 0.10.0.beta.10
+  version: 0.10.0.qs.0
 platform: ruby
 authors: 
 - Adam Jacob
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-13 00:00:00 -07:00
+date: 2011-06-12 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -200,17 +200,17 @@ files:
 - LICENSE
 - README.rdoc
 - distro/arch/etc/conf.d/chef-client.conf
+- distro/arch/etc/conf.d/chef-expander.conf
 - distro/arch/etc/conf.d/chef-server-webui.conf
 - distro/arch/etc/conf.d/chef-server.conf
-- distro/arch/etc/conf.d/chef-solr-indexer.conf
 - distro/arch/etc/conf.d/chef-solr.conf
 - distro/arch/etc/rc.d/chef-client
+- distro/arch/etc/rc.d/chef-expander
 - distro/arch/etc/rc.d/chef-server
 - distro/arch/etc/rc.d/chef-server-webui
 - distro/arch/etc/rc.d/chef-solr
-- distro/arch/etc/rc.d/chef-solr-indexer
 - distro/common/html/chef-client.8.html
-- distro/common/html/chef-expander-cluster.8.html
+- distro/common/html/chef-expander.8.html
 - distro/common/html/chef-expanderctl.8.html
 - distro/common/html/chef-server-webui.8.html
 - distro/common/html/chef-server.8.html
@@ -252,7 +252,7 @@ files:
 - distro/common/man/man1/knife.1
 - distro/common/man/man1/shef.1
 - distro/common/man/man8/chef-client.8
-- distro/common/man/man8/chef-expander-cluster.8
+- distro/common/man/man8/chef-expander.8
 - distro/common/man/man8/chef-expanderctl.8
 - distro/common/man/man8/chef-server-webui.8
 - distro/common/man/man8/chef-server.8
@@ -276,7 +276,7 @@ files:
 - distro/common/markdown/man1/knife.mkd
 - distro/common/markdown/man1/shef.mkd
 - distro/common/markdown/man8/chef-client.mkd
-- distro/common/markdown/man8/chef-expander-cluster.mkd
+- distro/common/markdown/man8/chef-expander.mkd
 - distro/common/markdown/man8/chef-expanderctl.mkd
 - distro/common/markdown/man8/chef-server-webui.mkd
 - distro/common/markdown/man8/chef-server.mkd
@@ -284,36 +284,36 @@ files:
 - distro/common/markdown/man8/chef-solr.mkd
 - distro/common/markdown/README
 - distro/debian/etc/default/chef-client
+- distro/debian/etc/default/chef-expander
 - distro/debian/etc/default/chef-server
 - distro/debian/etc/default/chef-server-webui
 - distro/debian/etc/default/chef-solr
-- distro/debian/etc/default/chef-solr-indexer
 - distro/debian/etc/init/chef-client.conf
+- distro/debian/etc/init/chef-expander.conf
 - distro/debian/etc/init/chef-server-webui.conf
 - distro/debian/etc/init/chef-server.conf
-- distro/debian/etc/init/chef-solr-indexer.conf
 - distro/debian/etc/init/chef-solr.conf
 - distro/debian/etc/init.d/chef-client
+- distro/debian/etc/init.d/chef-expander
 - distro/debian/etc/init.d/chef-server
 - distro/debian/etc/init.d/chef-server-webui
 - distro/debian/etc/init.d/chef-solr
-- distro/debian/etc/init.d/chef-solr-indexer
 - distro/README
 - distro/redhat/etc/init.d/chef-client
+- distro/redhat/etc/init.d/chef-expander
 - distro/redhat/etc/init.d/chef-server
 - distro/redhat/etc/init.d/chef-server-webui
 - distro/redhat/etc/init.d/chef-solr
-- distro/redhat/etc/init.d/chef-solr-indexer
 - distro/redhat/etc/logrotate.d/chef-client
+- distro/redhat/etc/logrotate.d/chef-expander
 - distro/redhat/etc/logrotate.d/chef-server
 - distro/redhat/etc/logrotate.d/chef-server-webui
 - distro/redhat/etc/logrotate.d/chef-solr
-- distro/redhat/etc/logrotate.d/chef-solr-indexer
 - distro/redhat/etc/sysconfig/chef-client
+- distro/redhat/etc/sysconfig/chef-expander
 - distro/redhat/etc/sysconfig/chef-server
 - distro/redhat/etc/sysconfig/chef-server-webui
 - distro/redhat/etc/sysconfig/chef-solr
-- distro/redhat/etc/sysconfig/chef-solr-indexer
 - lib/chef/api_client.rb
 - lib/chef/application/agent.rb
 - lib/chef/application/client.rb
@@ -348,6 +348,7 @@ files:
 - lib/chef/exceptions.rb
 - lib/chef/file_access_control.rb
 - lib/chef/file_cache.rb
+- lib/chef/handler/error_report.rb
 - lib/chef/handler/json_file.rb
 - lib/chef/handler.rb
 - lib/chef/index_queue/amqp_client.rb
@@ -388,6 +389,7 @@ files:
 - lib/chef/knife/cookbook_site_vendor.rb
 - lib/chef/knife/cookbook_test.rb
 - lib/chef/knife/cookbook_upload.rb
+- lib/chef/knife/core/bootstrap_context.rb
 - lib/chef/knife/core/cookbook_scm_repo.rb
 - lib/chef/knife/core/generic_presenter.rb
 - lib/chef/knife/core/node_editor.rb
@@ -458,6 +460,7 @@ files:
 - lib/chef/mixins.rb
 - lib/chef/monkey_patches/dir.rb
 - lib/chef/monkey_patches/numeric.rb
+- lib/chef/monkey_patches/object.rb
 - lib/chef/monkey_patches/regexp.rb
 - lib/chef/monkey_patches/string.rb
 - lib/chef/monkey_patches/tempfile.rb

data/distro/debian/etc/init/chef-solr-indexer.conf

@@ -1,17 +0,0 @@
-# chef-solr-indexer - Chef Solr Indexer
-#
-# Chef Solr Indexer provides indexing of Solr for Chef Server
-
-description "Chef Solr Indexer"
-
-start on filesystem
-stop on runlevel [!2345]
-
-respawn
-respawn limit 5 30
-
-pre-start script
-    test -x /usr/bin/chef-solr-indexer || { stop; exit 0; }
-end script
-
-exec /usr/bin/chef-solr-indexer -c /etc/chef/solr.rb -L /var/log/chef/solr-indexer.log

data/distro/redhat/etc/logrotate.d/chef-solr-indexer

@@ -1,8 +0,0 @@
-/var/log/chef/solr-indexer.log {
-  rotate 12
-  weekly
-  compress
-  postrotate
-    /etc/init.d/chef-solr-indexer condrestart >/dev/null || :
-  endscript
-}

data/distro/redhat/etc/sysconfig/chef-solr-indexer

@@ -1,7 +0,0 @@
-# Configuration file for the chef-solr-indexer service
-
-#PIDFILE=/var/run/chef/solr-indexer.pid
-#CONFIG=/etc/chef/solr-indexer.rb
-#LOGFILE=/var/log/chef/solr-indexer.log
-# Any additional chef-solr-indexer options.
-#OPTIONS=