From ae2575b45de1e8f4c0ec956cebe0eed2bafbcf57 Mon Sep 17 00:00:00 2001
From: luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>
Date: Tue, 24 Jan 2006 06:01:58 +0000
Subject: 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
---
 bin/puppetd | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

(limited to 'bin')

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$
-- 
cgit