X-Git-Url: http://git.ieval.ro/?p=gruntmaster-daemon.git;a=blobdiff_plain;f=lib%2FGruntmaster%2FDaemon.pm;h=048321e3acd15d1be05ac064f24074319765105b;hp=31e03984c4f370ab1f951508a89bcee2f963e4b6;hb=04f37b061e9367664bc357ac427a186d4d14ee14;hpb=ac964998cb64edc36511291d589942870a729a8d

diff --git a/lib/Gruntmaster/Daemon.pm b/lib/Gruntmaster/Daemon.pm
index 31e0398..048321e 100644
--- a/lib/Gruntmaster/Daemon.pm
+++ b/lib/Gruntmaster/Daemon.pm
@@ -22,6 +22,7 @@ use constant FORMAT_EXTENSION => {
 	CPP => 'cpp',
 	GCCGO => 'go',
 	GOLANG => 'go',
+	GOLFSCRIPT => 'gs',
 	HASKELL => 'hs',
 	MONO => 'cs',
 	JAVA => 'java',
@@ -117,8 +118,10 @@ sub process_job {
 		},
 		map { $_ => $job->problem->get_column($_) } qw/generator runner judge precnt testcnt timeout olimit/
 	};
+	my $limit_override = $job->result_source->schema->limits->find($meta->{problem}, $job->format);
+	$meta->{timeout} = $limit_override->timeout if $limit_override;
 	$meta->{tests} = decode_json $job->problem->tests if $meta->{runner} eq 'File';
-	delete $meta->{precnt} unless $job->contest;
+	delete $meta->{precnt} unless $job->contest && $job->contest->is_running;
 	$meta->{testcnt} = $meta->{precnt} if $meta->{precnt};
 
 	$meta->{files}{ver} = {