From 39edd6d3f8eec4c2196aaabcd3e7ad5086bb782b Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Sat, 12 Apr 2014 10:05:59 -0700
Subject: [PATCH] remote job submission: improve error reporting

---
 html/user/submit_rpc_handler.php | 5 ++++-
 tools/create_work.cpp            | 6 +++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/html/user/submit_rpc_handler.php b/html/user/submit_rpc_handler.php
index 848491f749..a8b83a40a5 100644
--- a/html/user/submit_rpc_handler.php
+++ b/html/user/submit_rpc_handler.php
@@ -181,10 +181,13 @@ function submit_jobs($jobs, $template, $app, $batch_id, $priority) {
 
     $cmd = "cd ../..; ./bin/create_work --appname $app->name --batch $batch_id --rsc_fpops_est $job->rsc_fpops_est --priority $priority --stdin";
     $h = popen($cmd, "w");
+    if ($h === false) {
+        xml_error(-1, "BOINC server: can't run create_work");
+    }
     fwrite($h, $x);
     $ret = pclose($h);
     if ($ret < 0) {
-        xml_error(-1, "BOINC server: can't create job");
+        xml_error(-1, "BOINC server: create_work failed");
     }
 }
 
diff --git a/tools/create_work.cpp b/tools/create_work.cpp
index 407ee0a976..1119ac14c6 100644
--- a/tools/create_work.cpp
+++ b/tools/create_work.cpp
@@ -331,7 +331,7 @@ int main(int argc, char** argv) {
             if (!strlen(jd2.wu.name)) {
                 sprintf(jd2.wu.name, "%s_%d", jd.wu.name, j);
             }
-            create_work(
+            retval = create_work(
                 jd2.wu,
                 jd2.wu_template,
                 jd2.result_template_file,
@@ -343,6 +343,10 @@ int main(int argc, char** argv) {
                 jd2.additional_xml,
                 value_buf
             );
+            if (retval) {
+                fprintf(stderr, "create_work() failed: %d\n", retval);
+                exit(1);
+            }
             if (values.size()) {
                 values += ",";
                 values += value_buf;