Fixing #291 -- the problem was that instead of throwing an error on a missing server, puppet was just exiting.

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1785 980ebf18-57e1-0310-9a29-db15c13687c0

1 files changed, 6 insertions, 6 deletions

diff --git a/lib/puppet.rb b/lib/puppet.rb
index 71c7743a7..7d21e8c3d 100644
--- a/lib/puppet.rb
+++ b/lib/puppet.rb
@@ -289,12 +289,12 @@ module Puppet
     # waiting for someone, somewhere, to generate events of some kind.
     def self.start(block = true)
         # Starting everything in its own thread, fwiw
-        defined? @services and @services.each do |svc|
+        defined? @services and @services.dup.each do |svc|
             newthread do
                 begin
                     svc.start
                 rescue => detail
-                    if Puppet[:debug]
+                    if Puppet[:trace]
                         puts detail.backtrace
                     end
                     @services.delete svc
@@ -303,15 +303,15 @@ module Puppet
             end
         end
 
+        # We need to give the services a chance to register their timers before
+        # we try to start monitoring them.
+        sleep 0.5
+
         unless @services.length > 0
             Puppet.notice "No remaining services; exiting"
             exit(1)
         end
 
-        # We need to give the services a chance to register their timers before
-        # we try to start monitoring them.
-        sleep 0.5
-
         if defined? @timers and ! @timers.empty?
             @timers.each do |timer|
                 EventLoop.current.monitor_timer timer