Mwalker has submitted this change and it was merged.
Change subject: Adding some additional logging
......................................................................
Adding some additional logging
Change-Id: I27621c19fcfcce46882cd438f8a8fc80408f5748
---
M sites/all/modules/recurring_globalcollect/recurring_globalcollect.module
M sites/all/modules/recurring_globalcollect/recurring_globalcollect_common.inc
M sites/all/modules/wmf_civicrm/recurring.inc
3 files changed, 24 insertions(+), 2 deletions(-)
Approvals:
Adamw: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/sites/all/modules/recurring_globalcollect/recurring_globalcollect.module
b/sites/all/modules/recurring_globalcollect/recurring_globalcollect.module
index 97bc7fb..c124908 100644
--- a/sites/all/modules/recurring_globalcollect/recurring_globalcollect.module
+++ b/sites/all/modules/recurring_globalcollect/recurring_globalcollect.module
@@ -193,6 +193,11 @@
watchdog('recurring_globalcollect', 'Attempting to process up to ' . $batch
. ' recurring contribution(s).');
$contribution_batch = wmf_civicrm_get_next_sched_contribution($batch);
+ watchdog(
+ 'recurring_globalcollect',
+ 'Query returned @count messages to process',
+ array('@count' => count($contribution_batch))
+ );
$result = recurring_globalcollect_batch_charge($contribution_batch,
$options);
$processed = count($result['succeeded']) + count($result['failed']);
@@ -210,6 +215,11 @@
// Process retries
watchdog('recurring_globalcollect', 'Attempting to retry up to ' . $batch .
' previously failed contribution(s).');
$retry_batch = recurring_globalcollect_get_failure_retry_batch($batch);
+ watchdog(
+ 'recurring_globalcollect',
+ 'Query returned @count messages to process',
+ array('@count' => count($contribution_batch))
+ );
$result = recurring_globalcollect_batch_charge($retry_batch, $options);
$processed = count($result['succeeded']) + count($result['failed']);
diff --git
a/sites/all/modules/recurring_globalcollect/recurring_globalcollect_common.inc
b/sites/all/modules/recurring_globalcollect/recurring_globalcollect_common.inc
index 4a66756..960487c 100644
---
a/sites/all/modules/recurring_globalcollect/recurring_globalcollect_common.inc
+++
b/sites/all/modules/recurring_globalcollect/recurring_globalcollect_common.inc
@@ -70,7 +70,13 @@
date_default_timezone_set( $oldTimezone );
$contribution_status_id = civicrm_api_contribution_status('Failed');
-
+
+ watchdog(
+ 'recurring_globalcollect',
+ 'Looking for failed contributions in timeframe @min 00:00:00 -> @max
23:59:59',
+ array('@min' => $start_date, '@max' => $date)
+ );
+
$query = <<<EOS
SELECT civicrm_contribution_recur.* FROM civicrm_contribution_recur
WHERE
diff --git a/sites/all/modules/wmf_civicrm/recurring.inc
b/sites/all/modules/wmf_civicrm/recurring.inc
index b71b7df..df13c85 100644
--- a/sites/all/modules/wmf_civicrm/recurring.inc
+++ b/sites/all/modules/wmf_civicrm/recurring.inc
@@ -196,7 +196,13 @@
}
$contribution_status_id = civicrm_api_contribution_status('Completed');
-
+
+ watchdog(
+ 'recurring_globalcollect',
+ 'Looking for next scheduled contributions in timeframe @min -> @max',
+ array('@min' => $start_day, '@max' => $end_day)
+ );
+
$query = <<<EOS
SELECT * FROM civicrm_contribution_recur
WHERE
--
To view, visit https://gerrit.wikimedia.org/r/111398
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I27621c19fcfcce46882cd438f8a8fc80408f5748
Gerrit-PatchSet: 3
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Mwalker <[email protected]>
Gerrit-Reviewer: Adamw <[email protected]>
Gerrit-Reviewer: Mwalker <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
