Merging changes from the head of the rework1 branch, r 784

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

1 files changed, 9 insertions, 0 deletions

diff --git a/lib/puppet/server/logger.rb b/lib/puppet/server/logger.rb
index 0ee2d75f0..d5feb0320 100755
--- a/lib/puppet/server/logger.rb
+++ b/lib/puppet/server/logger.rb
@@ -10,6 +10,11 @@ class Server # :nodoc:
 
         # accept a log message from a client, and route it accordingly
         def addlog(message, client = nil, clientip = nil)
+            unless message
+                raise Puppet::DevError, "Did not receive message"
+            end
+
+            Puppet.info message.inspect
             # if the client is set, then we're not local
             if client
                 begin
@@ -22,6 +27,10 @@ class Server # :nodoc:
                 end
             end
 
+            unless message
+                raise Puppet::DevError, "Could not resurrect message"
+            end
+
             # Mark it as remote, so it's not sent to syslog
             message.remote = true