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

diff --git a/lib/Gruntmaster/Daemon.pm b/lib/Gruntmaster/Daemon.pm
index 1d1ca01..8a0048d 100644
--- a/lib/Gruntmaster/Daemon.pm
+++ b/lib/Gruntmaster/Daemon.pm
@@ -40,8 +40,7 @@ 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 +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;
@@ -122,14 +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},
@@ -172,6 +171,7 @@ 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;
+	Gruntmaster::Data->import;
 	$db = Gruntmaster::Data->connect('dbi:Pg:');
 	Log::Log4perl->init('/etc/gruntmasterd/gruntmasterd-log.conf');
 	get_logger->info("gruntmasterd $VERSION started");