jenkins-bot has submitted this change and it was merged.
Change subject: Set up SmashPig cron and more tables
......................................................................
Set up SmashPig cron and more tables
Consume the pending queue to db once a minute, requeue and expire
delayed messages, and run Adyen jobs from the Stomp job queue.
Note that the scripts in Schema are idempotent (so far), so we can
run them all to keep up with additions.
Change-Id: Icfd3890c356fcb5acafa87012abc8643442e2888
---
M puppet/modules/smashpig/manifests/init.pp
A puppet/modules/smashpig/templates/SmashPig.cron.d.erb
2 files changed, 15 insertions(+), 2 deletions(-)
Approvals:
Awight: Looks good to me, approved
jenkins-bot: Verified
diff --git a/puppet/modules/smashpig/manifests/init.pp
b/puppet/modules/smashpig/manifests/init.pp
index 222fc63..b86c9af 100644
--- a/puppet/modules/smashpig/manifests/init.pp
+++ b/puppet/modules/smashpig/manifests/init.pp
@@ -50,11 +50,18 @@
mysql::db { 'smashpig': }
exec { 'smashpig_schema':
- command => "/usr/bin/mysql -uroot -p${mysql::root_password} smashpig
-qfsA < ${dir}/Schema/001_CreatePendingTable.sql",
- unless => "/usr/bin/mysql -uroot -p${mysql::root_password} smashpig
-qfsANe \"select 1 from smashpig.pending\" | /usr/bin/tail -1 | /bin/grep -q 1",
+ command => "cat ${dir}/Schema/mysql/*.sql | /usr/bin/mysql -uroot
-p${mysql::root_password} smashpig -qfsA",
require => [
Git::Clone['wikimedia/fundraising/SmashPig'],
Mysql::Db['smashpig'],
],
}
+
+ file { '/etc/cron.d/SmashPig':
+ content => template('smashpig/SmashPig.cron.d.erb'),
+ owner => 'root',
+ group => 'root',
+ mode => '0644'
+ }
+
}
diff --git a/puppet/modules/smashpig/templates/SmashPig.cron.d.erb
b/puppet/modules/smashpig/templates/SmashPig.cron.d.erb
new file mode 100644
index 0000000..d22e4b3
--- /dev/null
+++ b/puppet/modules/smashpig/templates/SmashPig.cron.d.erb
@@ -0,0 +1,6 @@
+# Consume the pending queue to a database once every minute
+* * * * * www-data php <%= scope.lookupvar('smashpig::dir')
%>/Maintenance/ConsumePendingQueue.php
+# Requeue delayed messages that are due for reprocessing
+2-52/10 * * * * www-data php <%=
scope.lookupvar('smashpig::dir') %>/Maintenance/RequeueDelayedMessages.php
+# Run jobs to process Adyen IPN messages
+4-59/5 * * * * www-data php <%= scope.lookupvar('smashpig::dir')
%>/Maintenance/StompJobRunner.php --config-node adyen
--
To view, visit https://gerrit.wikimedia.org/r/309221
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icfd3890c356fcb5acafa87012abc8643442e2888
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Ejegg <eeggles...@wikimedia.org>
Gerrit-Reviewer: Awight <awi...@wikimedia.org>
Gerrit-Reviewer: BryanDavis <bda...@wikimedia.org>
Gerrit-Reviewer: Cdentinger <cdentin...@wikimedia.org>
Gerrit-Reviewer: Dduvall <dduv...@wikimedia.org>
Gerrit-Reviewer: Ejegg <eeggles...@wikimedia.org>
Gerrit-Reviewer: XenoRyet <dkozlow...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
