Get rid of safe_can_nodie

[gruntmaster-daemon.git] / lib / Gruntmaster / Daemon.pm

diff --git a/lib/Gruntmaster/Daemon.pm b/lib/Gruntmaster/Daemon.pm
index 880c0da49a47c1cf8915f952234b6c2609573e38..4f3360ca420df63f90cb4863e63ef9700c7c5ca6 100644 (file)
--- a/lib/Gruntmaster/Daemon.pm
+++ b/lib/Gruntmaster/Daemon.pm
@@ -35,19 +35,13 @@ use constant FORMAT_EXTENSION => {
 
 my $db;
 
-sub safe_can_nodie {
+sub safe_can {
        my ($type, $sub, $name) = @_;
 
        return unless $name =~ /^\w+$/s;
        my $pkg = __PACKAGE__ . "::${type}::${name}";
        eval "require $pkg" or get_logger->warn("Error while requiring $pkg: $@");
-       $pkg->can($sub);
-}
-
-sub safe_can {
-       my ($type, $sub, $name) = @_;
-
-       safe_can_nodie @_ or get_logger->logdie("No such \l$type: '$name'");
+       $pkg->can($sub) or get_logger->logdie("No such \l$type: '$name'");
 }
 
 sub process{