Commit 7dec1b27 authored by Leigh B. Stoller's avatar Leigh B. Stoller

Remove old error message.

Include assign.log in email message when assign fails.
parent 71758ca2
...@@ -365,19 +365,14 @@ sub fatal() ...@@ -365,19 +365,14 @@ sub fatal()
print STDOUT "DB Error deleting experiment record for $pid/$eid\n"; print STDOUT "DB Error deleting experiment record for $pid/$eid\n";
} }
#
# For debugging failures?
#
if (chdir($expdir)) {
$save = "$eid-$PID";
# Fucking taint checks. Whats wrong with rename("$eid", "$save");
system("/bin/mv", "-f", "$eid", "$save");
}
# #
# In batch mode, exit. Make sure to delete tempns file. # In batch mode, exit. Make sure to delete tempns file.
# #
if ($batch) { if ($batch) {
if (chdir($expdir)) {
system("/bin/mv", "-f", "$eid", "$eid-$PID");
}
unlink("$tempns"); unlink("$tempns");
exit(-1); exit(-1);
} }
...@@ -411,10 +406,22 @@ sub fatal() ...@@ -411,10 +406,22 @@ sub fatal()
} }
close(IN); close(IN);
} }
if (open(IN, "$eiddir/assign.log")) {
print MAIL "\n\n---------\n\n";
while (<IN>) {
print MAIL "$_";
}
close(IN);
}
close(MAIL); close(MAIL);
unlink("$tempns"); unlink("$tempns");
unlink("$logname"); unlink("$logname");
if (chdir($expdir)) {
system("/bin/mv", "-f", "$eid", "$eid-$PID");
}
exit(-1); exit(-1);
} }
......
...@@ -125,7 +125,6 @@ while ($done == 0) { ...@@ -125,7 +125,6 @@ while ($done == 0) {
&tbs_out("Allocating resources - This may take a while.\n"); &tbs_out("Allocating resources - This may take a while.\n");
if (&tbs_exec("assign_wrapper $irfile $ptopfile")) { if (&tbs_exec("assign_wrapper $irfile $ptopfile")) {
&tbs_out("Failed to allocate resources.\n"); &tbs_out("Failed to allocate resources.\n");
&tbs_out(" See $logfile and assign.log for more info.\n");
} else { } else {
# now we need to read what resources are needed from the IR file # now we need to read what resources are needed from the IR file
eval {&ir_read($irfile)}; eval {&ir_read($irfile)};
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment