ArielGlenn has submitted this change and it was merged.
Change subject: jobchron on trusty did not log at the proper place
......................................................................
jobchron on trusty did not log at the proper place
The jobchron.upstart.erb template missed stdout/stderr redirection to
/var/log/mediawiki. The output ends up being collected by upstart in a
file only readable by root: /var/log/upstart/jobchron.log
Redirect the service standard channels to JOBCHRON_LOGFILE with a
default of /var/log/mediawiki/jobchron.log. This is done the same way
as the jobrunner.upstart.erb template (note the trailing \ for line
continuation).
The logrotate configuration has already been done in a previous change.
Bug: T96132
Bug: T146040
Change-Id: Ib6f9efcca36e2adb76f61bbed6e1b3626ac542c5
---
M modules/mediawiki/templates/initscripts/jobchron.upstart.erb
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
ArielGlenn: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/mediawiki/templates/initscripts/jobchron.upstart.erb
b/modules/mediawiki/templates/initscripts/jobchron.upstart.erb
index a701ed1..ccd2d2f 100644
--- a/modules/mediawiki/templates/initscripts/jobchron.upstart.erb
+++ b/modules/mediawiki/templates/initscripts/jobchron.upstart.erb
@@ -17,7 +17,8 @@
exec start-stop-daemon --quiet --start --pidfile
"${JOBCHRON_PID:-/var/run/jobchron/pid}" \
--chuid "${JOBRUNNER_USER:-nobody}:${JOBRUNNER_GROUP:-nogroup}"
--make-pidfile \
--exec /usr/bin/php --
/srv/deployment/jobrunner/jobrunner/redisJobChronService \
- --config-file="${JOBRUNNER_CONFIG:-/etc/jobrunner.conf}" $DAEMON_OPTS
+ --config-file="${JOBRUNNER_CONFIG:-/etc/jobrunner.conf}" $DAEMON_OPTS \
+ >> "${JOBCHRON_LOGFILE:-/var/log/mediawiki/jobchron.log}" 2>&1
end script
respawn
--
To view, visit https://gerrit.wikimedia.org/r/312201
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib6f9efcca36e2adb76f61bbed6e1b3626ac542c5
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <has...@free.fr>
Gerrit-Reviewer: Alex Monk <a...@wikimedia.org>
Gerrit-Reviewer: ArielGlenn <ar...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
