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

Merge pull request #2031 from bema-ligo/db_purge_log_dont_delete 

db_purge: log when purging was skipped due to --dont_delete
This commit is contained in:
David Anderson 2018-07-26 04:13:37 -07:00 committed by GitHub
parent 0cc45a1395 08b6d04b38
commit d926d5fb5f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
sched/db_purge.cpp
View File

@ -579,13 +579,17 @@ int purge_and_archive_results(DB_WORKUNIT& wu, int& number_results) {
"Archived result [%lu] to a file\n", result.id "Archived result [%lu] to a file\n", result.id
); );
} }
if (!dont_delete) { if (dont_delete) {
log_messages.printf(MSG_DEBUG,
"Didn't purge result [%lu] from database (-dont_delete)\n", result.id
);
} else {
retval = result.delete_from_db(); retval = result.delete_from_db();
if (retval) return retval; if (retval) return retval;
log_messages.printf(MSG_DEBUG,
"Purged result [%lu] from database\n", result.id
);
} }
log_messages.printf(MSG_DEBUG,
"Purged result [%lu] from database\n", result.id
);
number_results++; number_results++;
} }
return 0; return 0;
@ -678,7 +682,11 @@ bool do_pass() {
// purge workunit from DB // purge workunit from DB
// //
if (!dont_delete) { if (dont_delete) {
log_messages.printf(MSG_DEBUG,
"Didn't purge workunit [%lu] from database (-dont_delete)\n", wu.id
);
} else {
retval= wu.delete_from_db(); retval= wu.delete_from_db();
if (retval) { if (retval) {
log_messages.printf(MSG_CRITICAL, log_messages.printf(MSG_CRITICAL,
@ -692,11 +700,10 @@ bool do_pass() {
sprintf(buf2, "workunitid=%lu", wu.id); sprintf(buf2, "workunitid=%lu", wu.id);
asg.delete_from_db_multi(buf2); asg.delete_from_db_multi(buf2);
} }
log_messages.printf(MSG_DEBUG,
"Purged workunit [%lu] from database\n", wu.id
);
} }
log_messages.printf(MSG_DEBUG,
"Purged workunit [%lu] from database\n", wu.id
);
purged_workunits++; purged_workunits++;
do_pass_purged_workunits++; do_pass_purged_workunits++;