summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorBernhard Miklautz <miklautz@inqnet.at>2010-08-13 14:55:48 +0200
committerMarkus Roberts <Markus@reality.com>2010-08-21 13:07:29 -0700
commit1ea4ccf44bc45ff7ccccc54720391bbe81c8a8fb (patch)
tree7d9a57b103fe41a1182f137b0d7f7d7b9471f8d7 /lib
parent4c280796f71fd2153ae05dfec227fb4123152088 (diff)
downloadpuppet-1ea4ccf44bc45ff7ccccc54720391bbe81c8a8fb.tar.gz
puppet-1ea4ccf44bc45ff7ccccc54720391bbe81c8a8fb.tar.xz
puppet-1ea4ccf44bc45ff7ccccc54720391bbe81c8a8fb.zip
Start server before agent
Diffstat (limited to 'lib')
-rwxr-xr-xlib/puppet/daemon.rb2
1 files changed, 1 insertions, 1 deletions
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