jenkins-bot has submitted this change and it was merged.
Change subject: Fix jobrunner.conf JSON
......................................................................
Fix jobrunner.conf JSON
Remove trailing commas that are not allowed by a strict JSON
parser. HHVM's json parser is loose and will handle the trailing
commas fine, but if you enable the Zend role the jobrunner will refuse
to start.
Change-Id: I4131ddc8033856a73f5aaf578c4828acdb925b1b
---
M puppet/modules/mediawiki/templates/jobrunner.json.erb
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
BryanDavis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/puppet/modules/mediawiki/templates/jobrunner.json.erb
b/puppet/modules/mediawiki/templates/jobrunner.json.erb
index 947a81f..4d8c764 100644
--- a/puppet/modules/mediawiki/templates/jobrunner.json.erb
+++ b/puppet/modules/mediawiki/templates/jobrunner.json.erb
@@ -12,14 +12,14 @@
// Ready queue trackers
"aggregators": [ "127.0.0.1" ],
// Main queue servers
- "queues": [ "127.0.0.1" ],
+ "queues": [ "127.0.0.1" ]
},
"limits": {
// How many times to let jobs be recycled before abandoning
"attempts": {
"*": 3
- },
+ }
},
"dispatcher": "nice -19 mwscript maintenance/runJobs.php --wiki=%(db)x
--type=%(type)x --maxtime=%(maxtime)x --memory-limit=%(maxmem)x --result=json"
--
To view, visit https://gerrit.wikimedia.org/r/161972
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4131ddc8033856a73f5aaf578c4828acdb925b1b
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: BryanDavis <[email protected]>
Gerrit-Reviewer: BryanDavis <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
