X-Git-Url: http://git.ieval.ro/?p=gruntmaster-daemon.git;a=blobdiff_plain;f=lib%2FGruntmaster%2FDaemon.pm;h=9597572cbbdb8cd31bc33ecde60d7ad07dc5be97;hp=2af9b5306a78229d334deaa819bd2b0fd30ece26;hb=HEAD;hpb=34cc90c9aa31c1cad1fcef0684e940407426ad1d

diff --git a/lib/Gruntmaster/Daemon.pm b/lib/Gruntmaster/Daemon.pm
index 2af9b53..9597572 100644
--- a/lib/Gruntmaster/Daemon.pm
+++ b/lib/Gruntmaster/Daemon.pm
@@ -8,6 +8,7 @@ our $VERSION = '5999.000_005';
 
 use Gruntmaster::Daemon::Constants qw/ERR/;
 use Gruntmaster::Daemon::Format qw/prepare_files stopvms/;
+use Gruntmaster::SendResults qw/send_results_request/;
 
 use File::Slurp qw/read_file/;
 use File::Temp qw/tempdir/;
@@ -26,6 +27,7 @@ use constant FORMAT_EXTENSION => {
 	GOLFSCRIPT => 'gs',
 	HASKELL => 'hs',
 	JAVA => 'java',
+	JAVASCRIPT => 'js',
 	JULIA => 'jl',
 	MONO => 'cs',
 	OBERON => 'm',
@@ -34,6 +36,7 @@ use constant FORMAT_EXTENSION => {
 	PERL => 'pl',
 	PHP => 'php',
 	PYTHON => 'py',
+	PYTHON3 => 'py',
 	RUBY => 'rb',
 	RUST => 'rs',
 	SBCL => 'l',
@@ -109,6 +112,7 @@ sub process{
 	$meta->{errors} = $errors;
 
 	get_logger->info('Job result: ' . $meta->{result_text});
+	send_results_request($meta->{job_id}, $meta->{result}, $meta->{result_text});
 }
 
 sub process_job {
@@ -128,8 +132,8 @@ sub process_job {
 	my $timeout_override = db()->query('SELECT timeout FROM limits WHERE problem=? AND format=?', $job->{problem}, $job->{format})->list;
 	$meta->{timeout} = $timeout_override if defined $timeout_override;
 	$meta->{tests} = decode_json $pb->{tests} if $meta->{runner} eq 'File';
-	$job->{contest} &&= contest_entry($job->{contest});
-	delete $meta->{precnt} unless $job->{contest} && $job->{contest}{started} && !$job->{contest}{finished}; ## no critic (ProhibitNegativeExpressionsInUnlessAndUntilConditions)
+	my $contest = $job->{contest} && contest_entry($job->{contest});
+	delete $meta->{precnt} unless $contest && $contest->{started} && !$contest->{finished}; ## no critic (ProhibitNegativeExpressionsInUnlessAndUntilConditions)
 	$meta->{testcnt} = $meta->{precnt} if $meta->{precnt};
 
 	$meta->{files}{ver} = {
@@ -137,6 +141,7 @@ sub process_job {
 		format => $pb->{verformat},
 		content => $pb->{versource},
 	} if $pb->{verformat};
+	$meta->{job_id} = $job->{id};
 
 	process $meta;