diff options
author | Luke Kanies <luke@madstop.com> | 2009-01-31 10:04:47 -0700 |
---|---|---|
committer | Luke Kanies <luke@madstop.com> | 2009-02-06 18:08:43 -0600 |
commit | 37d1a7cf2c637e2bde16623007014125066fcec5 (patch) | |
tree | 23bf820321e143634e8a340b60cbd6a4288487fb /lib/puppet/configurer.rb | |
parent | bf3c72e8a1ed59daf5027c508f2d6dd95424f5bc (diff) | |
download | puppet-37d1a7cf2c637e2bde16623007014125066fcec5.tar.gz puppet-37d1a7cf2c637e2bde16623007014125066fcec5.tar.xz puppet-37d1a7cf2c637e2bde16623007014125066fcec5.zip |
Removing restart-handling from Configurer
This will be handled by the Agent or the Daemon class.
Signed-off-by: Luke Kanies <luke@madstop.com>
Diffstat (limited to 'lib/puppet/configurer.rb')
-rw-r--r-- | lib/puppet/configurer.rb | 21 |
1 files changed, 0 insertions, 21 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 |