From b4e97de7262ed89388ab7aa2cd236d7e6476d0fc Mon Sep 17 00:00:00 2001
From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Thu, 5 Mar 2009 09:35:50 +0100
Subject: [PATCH] contrib/collection3: Minor cleanups.

---
 .../collection3/lib/Collectd/Graph/Config.pm    |  3 +--
 .../collection3/lib/Collectd/Graph/Type/Df.pm   | 17 ++++++++++++++++-
 .../lib/Collectd/Graph/TypeLoader.pm            |  4 ++--
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/contrib/collection3/lib/Collectd/Graph/Config.pm b/contrib/collection3/lib/Collectd/Graph/Config.pm
index d20be359..42582a7e 100644
--- a/contrib/collection3/lib/Collectd/Graph/Config.pm
+++ b/contrib/collection3/lib/Collectd/Graph/Config.pm
@@ -6,7 +6,7 @@ Collectd::Graph::Config - Parse the collection3 config file.
 
 =cut
 
-# Copyright (C) 2008  Florian octo Forster <octo at verplant.org>
+# Copyright (C) 2008,2009  Florian octo Forster <octo at verplant.org>
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free Software
@@ -27,7 +27,6 @@ use warnings;
 use Carp (qw(cluck confess));
 use Exporter ();
 use Config::General ('ParseConfig');
-use Collectd::Graph::Type ();
 
 @Collectd::Graph::Config::ISA = ('Exporter');
 @Collectd::Graph::Config::EXPORT_OK = (qw(gc_read_config gc_get_config
diff --git a/contrib/collection3/lib/Collectd/Graph/Type/Df.pm b/contrib/collection3/lib/Collectd/Graph/Type/Df.pm
index b4eb8b1c..0fbd0d35 100644
--- a/contrib/collection3/lib/Collectd/Graph/Type/Df.pm
+++ b/contrib/collection3/lib/Collectd/Graph/Type/Df.pm
@@ -1,5 +1,20 @@
 package Collectd::Graph::Type::Df;
 
+# Copyright (C) 2008,2009  Florian octo Forster <octo at verplant.org>
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; only version 2 of the License is applicable.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
 use strict;
 use warnings;
 use base ('Collectd::Graph::Type');
@@ -43,7 +58,7 @@ sub getRRDArgs
   my $faded_green = get_faded_color ('00ff00');
   my $faded_red = get_faded_color ('ff0000');
 
-  return (['-t', 'Free space (' . $ident->{'type_instance'} . ')', '-v', 'Bytes', '-l', '0',
+  return (['-t', 'Diskspace (' . $ident->{'type_instance'} . ')', '-v', 'Bytes', '-l', '0',
     "DEF:free_min=${filename}:free:MIN",
     "DEF:free_avg=${filename}:free:AVERAGE",
     "DEF:free_max=${filename}:free:MAX",
diff --git a/contrib/collection3/lib/Collectd/Graph/TypeLoader.pm b/contrib/collection3/lib/Collectd/Graph/TypeLoader.pm
index 2452b2a0..a9e85f57 100644
--- a/contrib/collection3/lib/Collectd/Graph/TypeLoader.pm
+++ b/contrib/collection3/lib/Collectd/Graph/TypeLoader.pm
@@ -58,8 +58,8 @@ sub _create_object
   my $module = shift;
   my $obj;
 
-  local $SIG{__WARN__} = sub {};
-  local $SIG{__DIE__} = sub {};
+  local $SIG{__WARN__} = sub { print STDERR "WARNING: " . join (', ', @_) . "\n"; };
+  local $SIG{__DIE__} = sub { print STDERR "FATAL: " . join (', ', @_) . "\n"; };
 
   eval <<PERL;
   require $module;
-- 
2.30.2