Ori.livneh has submitted this change and it was merged.

Change subject: Ensure job{chron/runner} pre-start clause has exit code 0 on 
success
......................................................................


Ensure job{chron/runner} pre-start clause has exit code 0 on success

Fix-up for Icb34377497.

Change-Id: I3cda9b3acbcb72ee63e5fa57d8d1ce91e62f7f4c
---
M modules/mediawiki/files/jobchron.conf
M modules/mediawiki/files/jobrunner.conf
2 files changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Ori.livneh: Verified; Looks good to me, approved



diff --git a/modules/mediawiki/files/jobchron.conf 
b/modules/mediawiki/files/jobchron.conf
index f14514e..a701ed1 100644
--- a/modules/mediawiki/files/jobchron.conf
+++ b/modules/mediawiki/files/jobchron.conf
@@ -8,8 +8,8 @@
   mkdir -p -m0755 /var/run/jobchron
   [ ! -r /etc/default/jobrunner ] && { stop; exit 0; }
   . /etc/default/jobrunner
-  mkdir -p -m0755 $(dirname 
"${JOBCHRON_LOGFILE:=/var/log/mediawiki/jobchron.log}")
   [ ! -r "${JOBRUNNER_CONFIG:=/etc/jobrunner.conf}" ] && { stop; exit 1; }
+  mkdir -p -m0755 $(dirname 
"${JOBCHRON_LOGFILE:=/var/log/mediawiki/jobchron.log}")
 end script
 
 script
diff --git a/modules/mediawiki/files/jobrunner.conf 
b/modules/mediawiki/files/jobrunner.conf
index 0dcd187..60b3f3b 100644
--- a/modules/mediawiki/files/jobrunner.conf
+++ b/modules/mediawiki/files/jobrunner.conf
@@ -8,8 +8,8 @@
   mkdir -p -m0755 /var/run/jobrunner
   [ ! -r /etc/default/jobrunner ] && { stop; exit 0; }
   . /etc/default/jobrunner
-  mkdir -p -m0755 $(dirname 
"${JOBRUNNER_LOGFILE:=/var/log/mediawiki/jobrunner.log}")
   [ ! -r "${JOBRUNNER_CONFIG:=/etc/jobrunner.conf}" ] && { stop; exit 1; }
+  mkdir -p -m0755 $(dirname 
"${JOBRUNNER_LOGFILE:=/var/log/mediawiki/jobrunner.log}")
 end script
 
 script

-- 
To view, visit https://gerrit.wikimedia.org/r/276658
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I3cda9b3acbcb72ee63e5fa57d8d1ce91e62f7f4c
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to