Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

*** empty log message *** 

svn path=/trunk/boinc/; revision=11806
This commit is contained in:
David Anderson 2007-01-08 22:15:21 +00:00
parent 8a212faa05
commit a810ae3be7
4 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
checkin_notes
View File

@ -285,3 +285,15 @@ David 8 Jan 2007
html/inc/
prefs.inc
David 8 Jan 2007
- core client: fixed crashing bug that happens when attaching
to a project with wrong URL (e.g. setiathome.ssl.berkeley.edu).
The fix allows the project to attach but prints a warning.
It would be better to not allow the attach;
I'll get back to this later
client/
client_types.h
cs_scheduler.C
scheduler_op.C

6
client/client_types.h
View File

@ -219,8 +219,10 @@ public:
// should be done (as requested by server)
bool possibly_backed_off;
bool trickle_up_pending; // have trickle up to send
bool tentative; // we haven't done a scheduler RPC to this project yet
// (still need to verify that its name isn't a dup)
bool tentative;
// we haven't done a scheduler RPC to this project yet;
// still need to verify that its name isn't a dup,
// and that the URL is correct
double last_rpc_time; // when last RPC finished
// Other stuff

6
client/cs_scheduler.C
View File

@ -882,14 +882,11 @@ int CLIENT_STATE::handle_scheduler_reply(
canonicalize_master_url(sr.master_url);
if (strcmp(sr.master_url, project->master_url)) {
msg_printf(project, MSG_ERROR,
"You are using the wrong URL for this project"
"You used the wrong URL for this project"
);
msg_printf(project, MSG_ERROR,
"The correct URL is %s", sr.master_url
);
if (project->tentative) {
return ERR_WRONG_URL;
}
p2 = gstate.lookup_project(sr.master_url);
if (p2) {
msg_printf(project, MSG_INFO,
@ -934,7 +931,6 @@ int CLIENT_STATE::handle_scheduler_reply(
msg_printf(project, MSG_ERROR,
"Consider detaching this project, then trying again"
);
return ERR_DUP_NAME;
}
}

4
client/scheduler_op.C
View File

@ -481,8 +481,8 @@ bool SCHEDULER_OP::poll() {
} else {
retval = gstate.handle_scheduler_reply(cur_proj, scheduler_url, nresults);
if (cur_proj->tentative) {
cur_proj->tentative = false;
retval = cur_proj->write_account_file();
cur_proj->tentative = false;
retval = cur_proj->write_account_file();
if (retval) {
cur_proj->attach_failed(ERR_ATTACH_FAIL_FILE_WRITE);
} else {