diff options
| author | Jesse Wolfe <jes5199@gmail.com> | 2010-08-17 16:19:38 -0700 |
|---|---|---|
| committer | Markus Roberts <Markus@reality.com> | 2010-08-21 13:07:28 -0700 |
| commit | 4c280796f71fd2153ae05dfec227fb4123152088 (patch) | |
| tree | 7d644d856dd58a349959f038563017e1f92f9f54 | |
| parent | d1150e0b91626e4f8843f17c413f88efd4a4ba77 (diff) | |
| download | puppet-4c280796f71fd2153ae05dfec227fb4123152088.tar.gz puppet-4c280796f71fd2153ae05dfec227fb4123152088.tar.xz puppet-4c280796f71fd2153ae05dfec227fb4123152088.zip | |
[#4555] puppet queue tries to call code it hasn't required
puppet queue was trying to call .subscribe on
Puppet::Resource::Catalog::Queue, but that object had not been loaded
into the ruby interpreter.
This bug was partially masked by ruby's confusing constant resolution,
which was incorrectly returning the Puppet::Application::Queue class
instead of throwing a NameError
| -rw-r--r-- | lib/puppet/application/queue.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/puppet/application/queue.rb b/lib/puppet/application/queue.rb index 6df825dd1..6c90ca0a1 100644 --- a/lib/puppet/application/queue.rb +++ b/lib/puppet/application/queue.rb @@ -38,6 +38,7 @@ class Puppet::Application::Queue < Puppet::Application option("--verbose","-v") def main + require 'lib/puppet/indirector/catalog/queue' # provides Puppet::Indirector::Queue.subscribe Puppet.notice "Starting puppetqd #{Puppet.version}" Puppet::Resource::Catalog::Queue.subscribe do |catalog| # Once you have a Puppet::Resource::Catalog instance, calling save on it should suffice |