Fixed puppetqd require and tweaked stomp library error message

1 files changed, 5 insertions, 5 deletions

diff --git a/lib/puppet/application/puppetqd.rb b/lib/puppet/application/puppetqd.rb
index 007bd89ec..9d2740a81 100644
--- a/lib/puppet/application/puppetqd.rb
+++ b/lib/puppet/application/puppetqd.rb
@@ -1,7 +1,7 @@
 require 'puppet'
 require 'puppet/daemon'
 require 'puppet/application'
-require 'puppet/node/catalog'
+require 'puppet/resource/catalog'
 require 'puppet/indirector/catalog/queue'
 
 Puppet::Application.new(:puppetqd) do
@@ -30,8 +30,8 @@ Puppet::Application.new(:puppetqd) do
     option("--verbose","-v")
 
     command(:main) do
-        Puppet::Node::Catalog::Queue.subscribe do |catalog|
-            # Once you have a Puppet::Node::Catalog instance, calling save() on it should suffice
+        Puppet::Resource::Catalog::Queue.subscribe do |catalog|
+            # Once you have a Puppet::Resource::Catalog instance, calling save() on it should suffice
             # to put it through to the database via its active_record indirector (which is determined
             # by the terminus_class = :active_record setting above)
             Puppet.notice "Processing queued catalog for %s" % catalog.name
@@ -60,7 +60,7 @@ Puppet::Application.new(:puppetqd) do
 
     setup do
         unless Puppet.features.stomp?
-            raise ArgumentError, "Could not load 'stomp', which must be present for queueing to work"
+            raise ArgumentError, "Could not load the 'stomp' library, which must be present for queueing to work.  You must install the required library."
         end
 
         setup_logs
@@ -69,6 +69,6 @@ Puppet::Application.new(:puppetqd) do
             exit(Puppet.settings.print_configs ? 0 : 1)
         end
 
-        Puppet::Node::Catalog.terminus_class = :active_record
+        Puppet::Resource::Catalog.terminus_class = :active_record
     end
 end