diff options
author | Luke Kanies <luke@madstop.com> | 2005-05-25 15:57:00 +0000 |
---|---|---|
committer | Luke Kanies <luke@madstop.com> | 2005-05-25 15:57:00 +0000 |
commit | d86e4796432a61aa89330f5bf19c68609bda1e0b (patch) | |
tree | 6cdad87707c351b0f88868fbfcbd5e9d4fc3fa16 /lib/blink/client.rb | |
parent | ebc02a881ce93e4b4f47a54f9066ab46442f71c1 (diff) | |
download | puppet-d86e4796432a61aa89330f5bf19c68609bda1e0b.tar.gz puppet-d86e4796432a61aa89330f5bf19c68609bda1e0b.tar.xz puppet-d86e4796432a61aa89330f5bf19c68609bda1e0b.zip |
All tests pass again, and i have added Type.allclear to remove all existing type instances, thus making it much easier to run all of the parser and lexer and then server tests; i have also added remove server tests
git-svn-id: https://reductivelabs.com/svn/puppet/library/trunk@273 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib/blink/client.rb')
-rw-r--r-- | lib/blink/client.rb | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/lib/blink/client.rb b/lib/blink/client.rb index ce92d7a97..3f64c37ba 100644 --- a/lib/blink/client.rb +++ b/lib/blink/client.rb @@ -26,11 +26,11 @@ module Blink @nil = nil @url = hash[:Server] if hash.include?(:Listen) and hash[:Listen] == false - Blink.notice "We're local" + Blink.notice "We're a local client" @localonly = true @driver = @url else - Blink.notice "We're networked" + Blink.notice "We're a networked client" @localonly = false @driver = SOAP::RPC::Driver.new(@url, 'urn:blink-server') @driver.add_method("getconfig", "name") @@ -53,7 +53,12 @@ module Blink Blink.debug "server is %s" % @url #client.loadproperty('files/sslclient.properties') Blink.notice("getting config") - objects = @driver.getconfig(self) + objects = nil + if @localonly + objects = @driver.getconfig(self) + else + objects = @driver.getconfig(Blink::Fact["hostname"]) + end self.config(objects) end |