jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/385297 )
Change subject: Use module_invoke for metrics
......................................................................
Use module_invoke for metrics
So turning that module off doesn't break everything.
Change-Id: I11b3323c1bfaf7496f0fd5c830ad9f7b8434a6ea
---
M sites/all/modules/queue2civicrm/queue2civicrm.module
M sites/all/modules/thank_you/thank_you.module
2 files changed, 14 insertions(+), 4 deletions(-)
Approvals:
Mepps: Looks good to me, approved
jenkins-bot: Verified
diff --git a/sites/all/modules/queue2civicrm/queue2civicrm.module
b/sites/all/modules/queue2civicrm/queue2civicrm.module
index 9d6cd8a..3f2f4cc 100644
--- a/sites/all/modules/queue2civicrm/queue2civicrm.module
+++ b/sites/all/modules/queue2civicrm/queue2civicrm.module
@@ -152,12 +152,12 @@
$metrics["${gateway}_donations"] = $count;
}
$metrics['total_donations'] = $counter->get_count_total();
- metrics_reporting_report_metrics( 'queue2civicrm', $metrics );
+ module_invoke( 'metrics_reporting', 'report_metrics', 'queue2civicrm',
$metrics );
$ageMetrics = array();
foreach ( $counter->get_average_ages() as $gateway => $age ) {
$ageMetrics["${gateway}_message_age"] = $age;
}
- metrics_reporting_report_metrics( 'donation_message_age', $ageMetrics );
+ module_invoke( 'metrics_reporting', 'report_metrics',
'donation_message_age', $ageMetrics );
if ($processed > 0) {
watchdog('queue2civicrm', 'Successfully processed ' . $processed . '
contribution(s).');
diff --git a/sites/all/modules/thank_you/thank_you.module
b/sites/all/modules/thank_you/thank_you.module
index 6df363e..17bdbb1 100644
--- a/sites/all/modules/thank_you/thank_you.module
+++ b/sites/all/modules/thank_you/thank_you.module
@@ -849,12 +849,22 @@
$metrics["${gateway}_thank_you_emails"] = $count;
}
$metrics['total_thank_you_emails'] = $counter->get_count_total();
- metrics_reporting_report_metrics( 'thank_you_emails_sent', $metrics );
+ module_invoke(
+ 'metrics_reporting',
+ 'report_metrics',
+ 'thank_you_emails_sent',
+ $metrics
+ );
$ageMetrics = array();
foreach ( $counter->get_average_ages() as $gateway => $age ) {
$ageMetrics["${gateway}_thank_you_donation_age"] = $age;
}
- metrics_reporting_report_metrics( 'thank_you_donation_age', $ageMetrics
);
+ module_invoke(
+ 'metrics_reporting',
+ 'report_metrics',
+ 'thank_you_donation_age',
+ $ageMetrics
+ );
watchdog(
"thank_you",
"Sent {$metrics['total_thank_you_emails']} thank you emails.",
--
To view, visit https://gerrit.wikimedia.org/r/385297
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I11b3323c1bfaf7496f0fd5c830ad9f7b8434a6ea
Gerrit-PatchSet: 3
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Ejegg <[email protected]>
Gerrit-Reviewer: AndyRussG <[email protected]>
Gerrit-Reviewer: Cdentinger <[email protected]>
Gerrit-Reviewer: Eileen <[email protected]>
Gerrit-Reviewer: Ejegg <[email protected]>
Gerrit-Reviewer: Jgleeson <[email protected]>
Gerrit-Reviewer: Katie Horn <[email protected]>
Gerrit-Reviewer: Mepps <[email protected]>
Gerrit-Reviewer: XenoRyet <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
