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 1e5d8b2874ceb3cf3a1e24defc47c84d535cab45..4f3360ca420df63f90cb4863e63ef9700c7c5ca6 100644 (file)
--- a/lib/Gruntmaster/Daemon.pm
+++ b/lib/Gruntmaster/Daemon.pm
@@ -35,19 +35,13 @@ use constant FORMAT_EXTENSION => {
 
 my $db;
 
 
 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: $@");
        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{
 }
 
 sub process{


@@ -141,7 +135,7 @@ sub process{
                problem => $jobr->problem,
                owner   => $jobr->owner,
                job     => $jobr->id,
                problem => $jobr->problem,
                owner   => $jobr->owner,
                job     => $jobr->id,

-               solved  => $solved}) if !$jobr->problem->private;
+               solved  => $solved}) if !$jobr->problem->is_private;

 }
 
 sub got_job{
 }
 
 sub got_job{