summaryrefslogtreecommitdiffstats
path: root/lib/puppet
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2007-08-15 16:56:05 -0500
committerLuke Kanies <luke@madstop.com>2007-08-15 16:56:05 -0500
commit297dabb63744f8ad468ee4bf5caa54a75754ceee (patch)
tree476b1d49ca73c7e4d898dc5f5b4397a80825685c /lib/puppet
parent901ae687eb75885c5b717b03f2d6667f5ed8ffb5 (diff)
downloadpuppet-297dabb63744f8ad468ee4bf5caa54a75754ceee.tar.gz
puppet-297dabb63744f8ad468ee4bf5caa54a75754ceee.tar.xz
puppet-297dabb63744f8ad468ee4bf5caa54a75754ceee.zip
Refactoring a small part of the interface between the configuration handler and the interpreter.
Diffstat (limited to 'lib/puppet')
-rw-r--r--lib/puppet/network/handler/configuration.rb10
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/puppet/network/handler/configuration.rb b/lib/puppet/network/handler/configuration.rb
index 8c82d2e8f..c1c77a357 100644
--- a/lib/puppet/network/handler/configuration.rb
+++ b/lib/puppet/network/handler/configuration.rb
@@ -55,12 +55,14 @@ class Puppet::Network::Handler
# Return the configuration version.
def version(client = nil, clientip = nil)
+ v = interpreter.configuration_version
# If we can find the node, then store the fact that the node
# has checked in.
- if node = node_handler.search(client)
- update_node_freshness(client)
+ if node = node_handler.details(client)
+ update_node_check(node)
end
- interpreter.parsedate
+
+ return v
end
private
@@ -187,7 +189,7 @@ class Puppet::Network::Handler
# Mark that the node has checked in. FIXME this needs to be moved into
# the SimpleNode class, or somewhere that's got abstract backends.
- def update_node_freshness(node)
+ def update_node_check(node)
if Puppet.features.rails? and Puppet[:storeconfigs]
Puppet::Rails.connect