diff options
author | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-01-24 06:01:58 +0000 |
---|---|---|
committer | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-01-24 06:01:58 +0000 |
commit | ae2575b45de1e8f4c0ec956cebe0eed2bafbcf57 (patch) | |
tree | 9c2b7c839087c285c228374f525315e55c392a34 /bin/puppetd | |
parent | 18e8e74a2e3b4c5d092fc0aae38bbc5455d4db48 (diff) | |
download | puppet-ae2575b45de1e8f4c0ec956cebe0eed2bafbcf57.tar.gz puppet-ae2575b45de1e8f4c0ec956cebe0eed2bafbcf57.tar.xz puppet-ae2575b45de1e8f4c0ec956cebe0eed2bafbcf57.zip |
Adding the event-loop stuff to the repository and switching to using it. Also, breaking many classes out into their own class files.
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@848 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'bin/puppetd')
-rwxr-xr-x | bin/puppetd | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/bin/puppetd b/bin/puppetd index 6d2b804b0..c082e2a80 100755 --- a/bin/puppetd +++ b/bin/puppetd @@ -259,11 +259,23 @@ end client.setcerts trap(:INT) { - exit(1) + client.shutdown } -client.run(onetime) +if onetime + begin + client.run + rescue => detail + Puppet.err detail.to_s + if Puppet[:debug] + puts detail.backtrace + end + end +else + client.start -#Puppet.join + # Mmm, hackish + Puppet.start +end # $Id$ |