*** empty log message ***

svn path=/trunk/boinc/; revision=3374
This commit is contained in:
David Anderson 2004-05-13 04:43:42 +00:00
parent ee2706cc2f
commit 265315aa8b
2 changed files with 16 additions and 13 deletions

View File

@ -58,7 +58,7 @@ int CLIENT_STATE::read_trickle_files(PROJECT* project, FILE* f) {
if (retval) continue; if (retval) continue;
fprintf(f, fprintf(f,
" <trickle_up>\n" " <trickle_up>\n"
" <result>%s</result>\n" " <result_name>%s</result_name>\n"
" <time>%d</time>\n" " <time>%d</time>\n"
" <text>\n" " <text>\n"
"%s\n" "%s\n"

View File

@ -461,28 +461,31 @@ bool SCHEDULER_OP::poll() {
project->scheduler_urls[url_index].text project->scheduler_urls[url_index].text
); );
} }
gstate.handle_scheduler_reply(project, scheduler_url, nresults); retval = gstate.handle_scheduler_reply(project, scheduler_url, nresults);
// if this was a tentative project and we didn't get user name, // if this was a tentative project and we didn't get user name,
// the account ID must be bad. Tell the user. // the account ID must be bad. Tell the user.
// //
if (project->tentative) { if (project->tentative) {
if (strlen(project->user_name)) { if (retval || strlen(project->user_name)==0) {
project_add_failed(project);
} else {
project->tentative = false; project->tentative = false;
project->write_account_file(); project->write_account_file();
} else {
project_add_failed(project);
} }
} else { } else {
if (retval) {
// if we asked for work and didn't get any, backoff(project, "Can't parse scheduler reply");
// back off this project
//
if (must_get_work && nresults==0) {
backoff(project, "No work from project\n");
} else { } else {
project->nrpc_failures = 0; // if we asked for work and didn't get any,
project->min_rpc_time = 0; // back off this project
//
if (must_get_work && nresults==0) {
backoff(project, "No work from project\n");
} else {
project->nrpc_failures = 0;
project->min_rpc_time = 0;
}
} }
} }