diff options
| author | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-01-07 23:23:31 +0000 |
|---|---|---|
| committer | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-01-07 23:23:31 +0000 |
| commit | 1d739731b20a5dd10a190d783556d5c5a0275137 (patch) | |
| tree | faaa554a9dae6491152c9b7018109a33a5e206bb /lib/puppet/event.rb | |
| parent | 3ba696de8829399ba9ade3712d00a8c6adc4667e (diff) | |
| download | puppet-1d739731b20a5dd10a190d783556d5c5a0275137.tar.gz puppet-1d739731b20a5dd10a190d783556d5c5a0275137.tar.xz puppet-1d739731b20a5dd10a190d783556d5c5a0275137.zip | |
Merging in refactoring from version 774 into version 784
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@785 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib/puppet/event.rb')
| -rw-r--r-- | lib/puppet/event.rb | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/lib/puppet/event.rb b/lib/puppet/event.rb index e2c364194..a7070bb3e 100644 --- a/lib/puppet/event.rb +++ b/lib/puppet/event.rb @@ -192,7 +192,7 @@ module Puppet end if transaction.triggered?(self.target, @callback) > 0 - Puppet.debug "%s has already run" % self + self.target.info "already applied %s" % [@callback] else # We need to call the method, so that it gets retrieved # as a real object. @@ -201,6 +201,7 @@ module Puppet # [@source,@event,@method,target] begin if target.respond_to?(@callback) + target.log "triggering %s" % @callback event = target.send(@callback) else Puppet.debug( @@ -240,14 +241,6 @@ module Puppet @event = args[:event] @source = args[:source] @transaction = args[:transaction] - - #Puppet.info "%s: %s(%s)" % - #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 - #@@events.push self end def to_s |