diff options
| -rw-r--r-- | lib/puppet/configurer.rb | 21 | ||||
| -rwxr-xr-x | spec/unit/configurer.rb | 22 |
2 files changed, 0 insertions, 43 deletions
diff --git a/lib/puppet/configurer.rb b/lib/puppet/configurer.rb index df531f494..2549410cf 100644 --- a/lib/puppet/configurer.rb +++ b/lib/puppet/configurer.rb @@ -79,23 +79,6 @@ class Puppet::Configurer upload_facts() end - # Mark that we should restart. The Puppet module checks whether we're running, - # so this only gets called if we're in the middle of a run. - def restart - # If we're currently running, then just mark for later - Puppet.notice "Received signal to restart; waiting until run is complete" - @restart = true - end - - # Should we restart? - def restart? - if defined? @restart - @restart - else - false - end - end - # Get the remote catalog, yo. Returns nil if no catalog can be found. def retrieve_catalog name = Facter.value("hostname") @@ -158,10 +141,6 @@ class Puppet::Configurer # Now close all of our existing http connections, since there's no # reason to leave them lying open. Puppet::Network::HttpPool.clear_http_instances - - # Did we get HUPped during the run? If so, then restart now that we're - # done with the run. - Process.kill(:HUP, $$) if self.restart? end private diff --git a/spec/unit/configurer.rb b/spec/unit/configurer.rb index 996d67282..92478eea8 100755 --- a/spec/unit/configurer.rb +++ b/spec/unit/configurer.rb @@ -58,28 +58,6 @@ describe Puppet::Configurer, "when executing a catalog run" do catalog.expects(:apply).never # because we're not yielding @agent.run end - - it "should HUP itself if it should be restarted" do - catalog = stub 'catalog', :retrieval_duration= => nil, :apply => nil - @agent.expects(:retrieve_catalog).returns catalog - - Process.expects(:kill).with(:HUP, $$) - - @agent.expects(:restart?).returns true - - @agent.run - end - - it "should not HUP itself if it should not be restarted" do - catalog = stub 'catalog', :retrieval_duration= => nil, :apply => nil - @agent.expects(:retrieve_catalog).returns catalog - - Process.expects(:kill).never - - @agent.expects(:restart?).returns false - - @agent.run - end end describe Puppet::Configurer, "when retrieving a catalog" do |