X-Git-Url: http://git.ieval.ro/?p=gruntmaster-daemon.git;a=blobdiff_plain;f=lib%2FGruntmaster%2FDaemon.pm;h=64f82312df71b5edde5d6e4dde3c0003e76be960;hp=681a141430953da05c7e2a11db3362522059c61c;hb=99d3711026b621247d46551b38f19c34f26342bd;hpb=a5d85109e94cca6c36ed5038cde7fed6b046d9da

diff --git a/lib/Gruntmaster/Daemon.pm b/lib/Gruntmaster/Daemon.pm
index 681a141..64f8231 100644
--- a/lib/Gruntmaster/Daemon.pm
+++ b/lib/Gruntmaster/Daemon.pm
@@ -7,8 +7,7 @@ use warnings;
 our $VERSION = '5999.000_004';
 
 use Gruntmaster::Daemon::Constants qw/ERR/;
-use Gruntmaster::Daemon::Format qw/prepare_files/;
-use Gruntmaster::Data;
+use Gruntmaster::Daemon::Format qw/prepare_files stopvms/;
 
 use File::Basename qw/fileparse/;
 use File::Temp qw/tempdir/;
@@ -34,13 +33,14 @@ 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);
@@ -86,7 +86,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;
@@ -121,13 +121,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},
@@ -168,6 +169,8 @@ sub got_job{
 }
 
 sub run{
+	warn "No GRUNTMASTER_VM environment variable. Running without a VM is a security risk.\n"  unless $ENV{GRUNTMASTER_VM};
+	require Gruntmaster::Data;
 	$db = Gruntmaster::Data->connect('dbi:Pg:');
 	Log::Log4perl->init('/etc/gruntmasterd/gruntmasterd-log.conf');
 	get_logger->info("gruntmasterd $VERSION started");