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

- client: improve work fetch messages 

- web: include user ID in email to moderators about banishment
This commit is contained in:
David Anderson 2013-03-16 20:41:58 -07:00 committed by Oliver Bock
parent 16738c6f30
commit 1ef582aad6
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
client/work_fetch.cpp
View File

@ -209,7 +209,7 @@ PROJECT* RSC_WORK_FETCH::choose_project_hyst(
if (log_flags.work_fetch_debug) { if (log_flags.work_fetch_debug) {
msg_printf(0, MSG_INFO, msg_printf(0, MSG_INFO,
"[work_fetch] %s: buffer_low: %s; sim_excluded_instances %d\n", "[work_fetch] choose_project() for %s: buffer_low: %s; sim_excluded_instances %d\n",
rsc_name(rsc_type), buffer_low?"yes":"no", sim_excluded_instances rsc_name(rsc_type), buffer_low?"yes":"no", sim_excluded_instances
); );
} }
@ -355,9 +355,10 @@ void RSC_WORK_FETCH::set_request(PROJECT* p) {
req_instances = nidle_now; req_instances = nidle_now;
if (log_flags.work_fetch_debug) { if (log_flags.work_fetch_debug) {
msg_printf(0, MSG_INFO, msg_printf(p, MSG_INFO,
"[work_fetch] set_request(): ninst %d nused_total %f nidle_now %f fetch share %f req_inst %f", "[work_fetch] set_request() for %s: ninst %d nused_total %f nidle_now %f fetch share %f req_inst %f req_secs %f",
ninstances, w.nused_total, nidle_now, w.fetchable_share, req_instances rsc_name(rsc_type), ninstances, w.nused_total, nidle_now,
w.fetchable_share, req_instances, req_secs
); );
} }
if (req_instances && !req_secs) { if (req_instances && !req_secs) {
@ -490,6 +491,12 @@ void RSC_WORK_FETCH::supplement(PROJECT* pp) {
RSC_PROJECT_WORK_FETCH& rpwf = project_state(p); RSC_PROJECT_WORK_FETCH& rpwf = project_state(p);
if (rpwf.anon_skip) continue; if (rpwf.anon_skip) continue;
if (p->sched_priority > x) { if (p->sched_priority > x) {
if (log_flags.work_fetch_debug) {
msg_printf(pp, MSG_INFO,
"[work_fetch]: not requesting work for %s: %s has higher priority",
rsc_name(rsc_type), p->get_project_name()
);
}
return; return;
} }
} }

2
html/inc/forum_email.inc
View File

@ -184,7 +184,7 @@ because your postings have not followed our guidelines.
$body .= "\n\nThe moderator gave the following explanation about your suspension:\n"; $body .= "\n\nThe moderator gave the following explanation about your suspension:\n";
$body .= $reason; $body .= $reason;
} }
$success = mail_report_list($forum, $user->name." has been banished.", $body); $success = mail_report_list($forum, "$user->name (ID $user->id) has been banished.", $body);
$success &= send_email($user, $subject, $body); $success &= send_email($user, $subject, $body);
pm_send($user, $user, $subject, $body, false); pm_send($user, $user, $subject, $body, false);
return $success; return $success;