Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/276653
Change subject: job{cron,runner}: don't attempt JSON validation of config file
......................................................................
job{cron,runner}: don't attempt JSON validation of config file
On (at least) mw1001, the Upstart jobs for jobchron and jobrunner seem to be
stuck in start/pre-start; ps shows that they are stuck on the step that
validates /etc/jobrunner/jobrunner.conf is a valid JSON file. Since we know
that the file is indeed valid, remove the check for now.
Bug: T129517
Change-Id: Icb343774974624bd487de22ed3d4a5cbe1214d0b
---
M modules/mediawiki/files/jobchron.conf
M modules/mediawiki/files/jobrunner.conf
2 files changed, 0 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/53/276653/1
diff --git a/modules/mediawiki/files/jobchron.conf
b/modules/mediawiki/files/jobchron.conf
index e6c94fa..39d0fec 100644
--- a/modules/mediawiki/files/jobchron.conf
+++ b/modules/mediawiki/files/jobchron.conf
@@ -10,7 +10,6 @@
. /etc/default/jobrunner
mkdir -p -m0755 $(dirname
"${JOBCHRON_LOGFILE:=/var/log/mediawiki/jobchron.log}")
[ ! -r "${JOBRUNNER_CONFIG:=/etc/jobrunner.conf}" ] && { stop; exit 1; }
- php -r "exit( !@is_array( json_decode( file_get_contents(
'$JOBRUNNER_CONFIG' ) ) ) );" >/dev/null 2>&1
[ $? -eq 0 ] || { stop; exit 1; }
end script
diff --git a/modules/mediawiki/files/jobrunner.conf
b/modules/mediawiki/files/jobrunner.conf
index 45524db..b24af5c 100644
--- a/modules/mediawiki/files/jobrunner.conf
+++ b/modules/mediawiki/files/jobrunner.conf
@@ -10,7 +10,6 @@
. /etc/default/jobrunner
mkdir -p -m0755 $(dirname
"${JOBRUNNER_LOGFILE:=/var/log/mediawiki/jobrunner.log}")
[ ! -r "${JOBRUNNER_CONFIG:=/etc/jobrunner.conf}" ] && { stop; exit 1; }
- php -r "exit( !@is_array( json_decode( file_get_contents(
'$JOBRUNNER_CONFIG' ) ) ) );" >/dev/null 2>&1
[ $? -eq 0 ] || { stop; exit 1; }
end script
--
To view, visit https://gerrit.wikimedia.org/r/276653
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icb343774974624bd487de22ed3d4a5cbe1214d0b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
