summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Gaffney <agaffney@gentoo.org>2008-01-07 03:59:27 +0000
committerAndrew Gaffney <agaffney@gentoo.org>2008-01-07 03:59:27 +0000
commit0e65917503a37e661826a3eaa521a22b5d31c38a (patch)
tree2b48e2e23facf7f8783dd7081ab949e4aa7a8c04
parentattempt to add the recurring job rescheduling into the server. (diff)
downloadscire-0e65917503a37e661826a3eaa521a22b5d31c38a.tar.gz
scire-0e65917503a37e661826a3eaa521a22b5d31c38a.tar.bz2
scire-0e65917503a37e661826a3eaa521a22b5d31c38a.zip
basic support for sending both stdout and stderr
svn path=/branches/new-fu/; revision=344
-rwxr-xr-xserver/scireserver.pl10
1 files changed, 5 insertions, 5 deletions
diff --git a/server/scireserver.pl b/server/scireserver.pl
index f577f1e..fa5de61 100755
--- a/server/scireserver.pl
+++ b/server/scireserver.pl
@@ -94,12 +94,12 @@ while(<>) {
set_job_status($jobid,$client_id,$status) and print "OK\n";
} elsif ($command eq "RETURN_JOBFILE") {
my $jobid = $args[0];
- my $filename = "$conf{job_dir}/$client_id/result/$jobid.result";
- print "OK ${filename}\n";
+ my @filenames = ("$conf{job_dir}/$client_id/result/$jobid.stdout", "$conf{job_dir}/$client_id/result/$jobid.stderr");
+ print "OK " . join(" ", @filenames) . "\n";
} elsif ($command eq "JOBFILE_SENT") {
- my $filename = $args[0];
- print "OK\n" and process_jobfile($filename);
-
+ my @filenames = @args;
+ process_jobfile($_) foreach(@jobfiles);
+ print "OK\n"
} else {
print "ERROR The command $command is unknown. Please try again.\n";
}