fixing verbose output to be better and easier to manage

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

2 files changed, 15 insertions, 10 deletions

diff --git a/lib/puppet/event.rb b/lib/puppet/event.rb
index cb120bc28..86893f6d1 100644
--- a/lib/puppet/event.rb
+++ b/lib/puppet/event.rb
@@ -103,18 +103,18 @@ module Puppet
         end
 
 		def initialize(args)
-            unless args.include?(:event) and args.include?(:object)
+            unless args.include?(:event) and args.include?(:change)
 				raise "Event.new called incorrectly"
 			end
 
-			@state = args[:state]
+			@change = args[:change]
 			@event = args[:event]
-			@object = args[:object]
+			#@object = args[:object]
 			@transaction = args[:transaction]
 
             #Puppet.info "%s: %s(%s)" %
-            Puppet.info "%s: %s changed from %s to %s" %
-                [@object,@state.name, @state.is,@state.should]
+            #Puppet.info "%s: %s changed from %s to %s" %
+            #    [@object,@state.name, @state.is,@state.should]
 
             # initially, just stuff all instances into a central bucket
             # to be handled as a batch
diff --git a/lib/puppet/statechange.rb b/lib/puppet/statechange.rb
index 3aca38a39..257558513 100644
--- a/lib/puppet/statechange.rb
+++ b/lib/puppet/statechange.rb
@@ -58,10 +58,12 @@ module Puppet
 
                 # i should maybe include object type, but the event type
                 # should basically point to that, right?
+                    #:state => @state,
+                    #:object => @state.parent,
+                Puppet.info self.to_s
                 return Puppet::Event.new(
                     :event => event,
-                    :state => @state,
-                    :object => @state.parent,
+                    :change => self,
                     :transaction => @transaction,
                     :message => self.to_s
                 )
@@ -74,10 +76,12 @@ module Puppet
                 #if pname.is_a?(Symbol)
                 #    pname = pname.id2name
                 #end
+                    #:state => @state,
+                    #:object => @state.parent,
+                Puppet.info "Failed: " + self.to_s
                 return Puppet::Event.new(
                     :event => pname + "_failed",
-                    :state => @state,
-                    :object => @state.parent,
+                    :change => self,
                     :transaction => @transaction,
                     :message => "Failed: " + self.to_s
                 )
@@ -121,7 +125,8 @@ module Puppet
 
 		#---------------------------------------------------------------
         def to_s
-            return "%s: %s => %s" % [@state,@is,@should]
+            return "%s: %s changed %s to %s" %
+                [@state.parent, @state.name, @is, @should]
         end
 		#---------------------------------------------------------------
 	end