From 1ea4ccf44bc45ff7ccccc54720391bbe81c8a8fb Mon Sep 17 00:00:00 2001
From: Bernhard Miklautz <miklautz@inqnet.at>
Date: Fri, 13 Aug 2010 14:55:48 +0200
Subject: Start server before agent

---
 lib/puppet/daemon.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/puppet/daemon.rb')

diff --git a/lib/puppet/daemon.rb b/lib/puppet/daemon.rb
index aa4a12bfa..ad0edd3b9 100755
--- a/lib/puppet/daemon.rb
+++ b/lib/puppet/daemon.rb
@@ -121,8 +121,8 @@ class Puppet::Daemon
     create_pidfile
 
     raise Puppet::DevError, "Daemons must have an agent, server, or both" unless agent or server
-    agent.start if agent
     server.start if server
+    agent.start if agent
 
     EventLoop.current.run
   end
-- 
cgit