From 08b6d04b38ca03288c0c4e19b4bbac03009f1230 Mon Sep 17 00:00:00 2001 From: Bernd Machenschalk Date: Sun, 13 Aug 2017 22:59:55 +0200 Subject: [PATCH] db_purge: log when purging was skipped due to --dont_delete --- sched/db_purge.cpp | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/sched/db_purge.cpp b/sched/db_purge.cpp index 4bd5254590..e26be6a31a 100644 --- a/sched/db_purge.cpp +++ b/sched/db_purge.cpp @@ -460,13 +460,17 @@ int purge_and_archive_results(DB_WORKUNIT& wu, int& number_results) { "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(); 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++; } return 0; @@ -555,7 +559,11 @@ bool do_pass() { // 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(); if (retval) { log_messages.printf(MSG_CRITICAL, @@ -569,11 +577,10 @@ bool do_pass() { sprintf(buf2, "workunitid=%lu", wu.id); 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++; do_pass_purged_workunits++;