X-Git-Url: http://git.ieval.ro/?p=gruntmaster-daemon.git;a=blobdiff_plain;f=lib%2FGruntmaster%2FDaemon.pm;h=ed2415812c0b61537fb97ede9420789195afb74a;hp=1d1ca01f9544c895168dd27e7ed356c3af2cebaf;hb=c3a7bac3a8effab522dc0b38b6d6dd0b0eb5add2;hpb=fdb99417bb13ca0418a5ec8d9e240e29565225c4

diff --git a/lib/Gruntmaster/Daemon.pm b/lib/Gruntmaster/Daemon.pm
index 1d1ca01..ed24158 100644
--- a/lib/Gruntmaster/Daemon.pm
+++ b/lib/Gruntmaster/Daemon.pm
@@ -33,15 +33,12 @@ use constant FORMAT_EXTENSION => {
 
 ##################################################
 
-sub purge;
-
 my $db;
 
 sub safe_can_nodie {
 	my ($type, $sub, $name) = @_;
 
-	return unless $name =~ /^\w+$/;
-	no strict 'refs';
+	return unless $name =~ /^\w+$/s;
 	my $pkg = __PACKAGE__ . "::${type}::${name}";
 	eval "require $pkg" or get_logger->warn("Error while requiring $pkg: $@");
 	$pkg->can($sub);
@@ -87,7 +84,7 @@ sub process{
 		prepare_files $meta;
 		chomp $errors;
 
-		my ($files, $generator, $runner, $judge, $testcnt) = map { $meta->{$_} or die "Required parameter missing: $_"} qw/files generator runner judge testcnt/;
+		my ($files, $generator, $runner, $judge, $testcnt) = map { $meta->{$_} or die "Required parameter missing: $_\n"} qw/files generator runner judge testcnt/;
 
 		$generator = safe_can Generator => generate => $generator;
 		$runner = safe_can Runner => run => $runner;
@@ -122,14 +119,14 @@ sub process{
 		$meta->{$_} = $results{$_} for keys %results;
 		$meta->{results} = \@full_results
 	} catch {
-		s,(.*) at .*,$1,;
+		s/(.*) at .*/$1/s;
 		chomp;
 		$meta->{result} = -1;
 		$meta->{result_text} = $_;
 	};
 	stopvms;
 
-	get_logger->info("Job result: " . $meta->{result_text});
+	get_logger->info('Job result: ' . $meta->{result_text});
 	return unless $jobr;
 	$jobr->update({
 		result => $meta->{result},
@@ -144,13 +141,7 @@ sub process{
 		problem => $jobr->problem,
 		owner   => $jobr->owner,
 		job     => $jobr->id,
-		solved  => $solved});
-
-	purge '/log/';
-	purge "/log/$job";
-	purge '/st/' . $jobr->contest if $jobr->contest;
-	purge '/us/';
-	purge '/us/' . $jobr->owner;
+		solved  => $solved}) if !$jobr->problem->private;
 }
 
 sub got_job{