5 files changed, 23 insertions, 9 deletions

diff --git a/lib/Nagios/Plugin.pm b/lib/Nagios/Plugin.pm
index 5debdbc..29b79b9 100644
--- a/lib/Nagios/Plugin.pm
+++ b/lib/Nagios/Plugin.pm
@@ -12,8 +12,6 @@ struct "Nagios::__::Plugin" => {
 package Nagios::Plugin;
 
 use Nagios::Plugin::Functions qw(:codes %ERRORS %STATUS_TEXT @STATUS_CODES);
-use Nagios::Plugin::Performance;
-use Nagios::Plugin::Threshold;
 
 use strict;
 use warnings;
@@ -29,6 +27,7 @@ our $VERSION = $Nagios::Plugin::Functions::VERSION;
 
 sub add_perfdata {
     my ($self, %args) = @_;
+    require Nagios::Plugin::Performance;
     my $perf = Nagios::Plugin::Performance->new(%args);
     push @{$self->perfdata}, $perf;
 }
@@ -37,7 +36,11 @@ sub all_perfoutput {
     return join(" ", map {$_->perfoutput} (@{$self->perfdata}));
 }
 
-sub set_thresholds { shift; Nagios::Plugin::Threshold->set_thresholds(@_); }
+sub set_thresholds { 
+    shift; 
+    require Nagios::Plugin::Threshold;
+    Nagios::Plugin::Threshold->set_thresholds(@_); 
+}
 
 # NP::Functions wrappers
 sub nagios_exit {
@@ -52,6 +55,13 @@ sub die {
     my $self = shift;
     Nagios::Plugin::Functions::nagios_die(@_, { plugin => $self });
 }
+# Override default shortname accessor to add default
+sub shortname {
+    my $self = shift;
+    $self->{'Nagios::__::Plugin::shortname'} = shift if @_;
+    return $self->{'Nagios::__::Plugin::shortname'} || 
+           Nagios::Plugin::Functions::get_shortname();
+}
 
 # -------------------------------------------------------------------------
 # NP::Functions::check_messages helpers and wrappers
diff --git a/lib/Nagios/Plugin/Functions.pm b/lib/Nagios/Plugin/Functions.pm
index 9cb7eb6..804661c 100644
--- a/lib/Nagios/Plugin/Functions.pm
+++ b/lib/Nagios/Plugin/Functions.pm
@@ -1,7 +1,10 @@
-# This module holds all exported variables
-# and base functions
+# Functional interface to basic Nagios::Plugin constants, exports, 
+# and functions
+
 package Nagios::Plugin::Functions;
 
+use 5.006;
+
 use strict;
 use warnings;
 use File::Basename;
@@ -47,7 +50,8 @@ sub get_shortname {
     return $arg{plugin}->shortname if $arg{plugin};
 
     my $shortname = uc basename($ENV{NAGIOS_PLUGIN} || $0);
-    $shortname =~ s/^CHECK_//;
+    $shortname =~ s/^CHECK_//;     # Remove any leading CHECK_
+    $shortname =~ s/\..*$//;       # Remove any trailing suffix
     return $shortname;
 }
 
diff --git a/lib/Nagios/Plugin/Performance.pm b/lib/Nagios/Plugin/Performance.pm
index 38803a6..512e07d 100644
--- a/lib/Nagios/Plugin/Performance.pm
+++ b/lib/Nagios/Plugin/Performance.pm
@@ -1,6 +1,6 @@
 package Nagios::Plugin::Performance;
 
-use 5.008004;
+use 5.006;
 
 use strict;
 use warnings;
diff --git a/lib/Nagios/Plugin/Range.pm b/lib/Nagios/Plugin/Range.pm
index f354a54..53a857f 100644
--- a/lib/Nagios/Plugin/Range.pm
+++ b/lib/Nagios/Plugin/Range.pm
@@ -1,6 +1,6 @@
 package Nagios::Plugin::Range;
 
-use 5.008004;
+use 5.006;
 
 use strict;
 use warnings;
diff --git a/lib/Nagios/Plugin/Threshold.pm b/lib/Nagios/Plugin/Threshold.pm
index 3e14d82..829da66 100644
--- a/lib/Nagios/Plugin/Threshold.pm
+++ b/lib/Nagios/Plugin/Threshold.pm
@@ -1,6 +1,6 @@
 package Nagios::Plugin::Threshold;
 
-use 5.008004;
+use 5.006;
 
 use strict;
 use warnings;