diff options
author | Michael Scherer <misc@mageia.org> | 2012-01-15 11:15:04 +0000 |
---|---|---|
committer | Michael Scherer <misc@mageia.org> | 2012-01-15 11:15:04 +0000 |
commit | 959613513a594fd72bfe3e9167c55078ae3cf3df (patch) | |
tree | 15f2abcfdcb1af2d5060c15914380b3f6cd7e6cb | |
parent | ad0fd76de968f3017d15fb4628f43b19ad1bbf91 (diff) | |
download | puppet-959613513a594fd72bfe3e9167c55078ae3cf3df.tar puppet-959613513a594fd72bfe3e9167c55078ae3cf3df.tar.gz puppet-959613513a594fd72bfe3e9167c55078ae3cf3df.tar.bz2 puppet-959613513a594fd72bfe3e9167c55078ae3cf3df.tar.xz puppet-959613513a594fd72bfe3e9167c55078ae3cf3df.zip |
do not spam ml with non loadable reports
-rw-r--r-- | modules/report-socket/lib/puppet/reports/socket.rb | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/modules/report-socket/lib/puppet/reports/socket.rb b/modules/report-socket/lib/puppet/reports/socket.rb index f682cb98..b1af057d 100644 --- a/modules/report-socket/lib/puppet/reports/socket.rb +++ b/modules/report-socket/lib/puppet/reports/socket.rb @@ -7,11 +7,16 @@ end Puppet::Reports.register_report(:socket) do configfile = File.join([File.dirname(Puppet.settings[:config]), "socket.yaml"]) - raise(Puppet::ParseError, "Socket report config file #{configfile} not readable") unless File.exist?(configfile) + # do not raise a error since this will show in puppet log + # raise(Puppet::ParseError, "Socket report config file #{configfile} not readable") unless + if File.exist?(configfile) - config = YAML.load_file(configfile) - SOCKET_PATH = config[:socket_path] - # TODO add support for using another user ? + # TODO add support for using another user ? + config = YAML.load_file(configfile) + SOCKET_PATH = config[:socket_path] + else + SOCKET_PATH = nil + end desc <<-DESC Send notification of failed reports to a socket. |