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

client: if using a dynamic AM (like Science United) use its prefs 

... rather than the prefs from projects, which the user can't control
This commit is contained in:
David Anderson 2024-08-15 23:34:56 -07:00
parent d8fe23b3c2
commit f3ac6205d4
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
client/acct_mgr.cpp
View File

@ -799,10 +799,18 @@ void ACCT_MGR_OP::handle_reply(int http_op_retval) {
// process prefs if any
//
if (!global_prefs_xml.empty()) {
double mod_time = GLOBAL_PREFS::parse_mod_time(
global_prefs_xml.c_str()
);
if (mod_time > gstate.global_prefs.mod_time) {
bool use_am_prefs;
// if dynamic AM (like SU) its prefs are our net prefs
//
if (ami.dynamic) {
use_am_prefs = true;
} else {
double mod_time = GLOBAL_PREFS::parse_mod_time(
global_prefs_xml.c_str()
);
use_am_prefs = mod_time > gstate.global_prefs.mod_time;
}
if (use_am_prefs) {
retval = gstate.save_global_prefs(
global_prefs_xml.c_str(), ami.master_url, ami.master_url
);

1
client/acct_mgr.h
View File

@ -84,6 +84,7 @@ struct ACCT_MGR_INFO : PROJ_AM {
// This AM dynamically decides what projects to assign.
// - send EC in AM RPCs
// - send starvation info if idle resources
// - network preferences are those from AM
USER_KEYWORDS user_keywords;
// user's yes/no keywords.
// These are conveyed to projects in scheduler requests