1 files changed, 1 insertions, 5 deletions
diff --git a/lib/puppet/application/puppetqd.rb b/lib/puppet/application/puppetqd.rb
index 05bb21fe9..a3a302e17 100644
--- a/lib/puppet/application/puppetqd.rb
+++ b/lib/puppet/application/puppetqd.rb
@@ -39,7 +39,7 @@ Puppet::Application.new(:puppetqd) do
             catalog.save
         end
 
-        sleep_forever()
+        Thread.list.each { |thread| thread.join }
     end
 
     # Handle the logging settings.
@@ -69,8 +69,4 @@ Puppet::Application.new(:puppetqd) do
 
         daemon.daemonize if Puppet[:daemonize]
     end
-
-    def sleep_forever
-        while true do sleep 1000 end
-    end
 end