Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/147653
Change subject: jobrunner: be more production-like
......................................................................
jobrunner: be more production-like
* Log to /var/mediawiki/jobrunner.log.
* Provision logrotate config.
Change-Id: I47823dc24c5e8c85cf70e841094b0bc04c750d73
---
M puppet/modules/mediawiki/files/jobrunner.conf
A puppet/modules/mediawiki/files/logrotate.d_mediawiki_jobrunner
M puppet/modules/mediawiki/manifests/jobrunner.pp
3 files changed, 26 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/53/147653/1
diff --git a/puppet/modules/mediawiki/files/jobrunner.conf
b/puppet/modules/mediawiki/files/jobrunner.conf
index 52925a0..9bb86b6 100644
--- a/puppet/modules/mediawiki/files/jobrunner.conf
+++ b/puppet/modules/mediawiki/files/jobrunner.conf
@@ -4,10 +4,13 @@
start on mediawiki-ready
stop on runlevel [!2345]
+umask 022
+
pre-start script
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.ini}" ] && { stop; exit 1; }
php -r "exit( !@is_array( parse_ini_file( '$JOBRUNNER_CONFIG' ) ) );"
>/dev/null 2>&1
[ $? -eq 0 ] || { stop; exit 1; }
@@ -17,8 +20,9 @@
. /etc/default/jobrunner
exec start-stop-daemon --quiet --start --pidfile
"${JOBRUNNER_PID:-/var/run/jobrunner/pid}" \
--chuid "${JOBRUNNER_USER:-nobody}:${JOBRUNNER_GROUP:-nogroup}"
--make-pidfile \
- --chdir "${JOBRUNNER_DIR:-/}" --exec /usr/bin/php --
/srv/jobrunner/redisJobRunnerService \
- --config-file="${JOBRUNNER_CONFIG:-/etc/jobrunner.ini}" $DAEMON_OPTS
+ --exec /usr/bin/php -- /srv/jobrunner/redisJobRunnerService \
+ --config-file="${JOBRUNNER_CONFIG:-/etc/jobrunner.ini}" $DAEMON_OPTS \
+ >> "${JOBRUNNER_LOGFILE:-/var/log/mediawiki/jobrunner.log}" 2>&1
end script
respawn
diff --git a/puppet/modules/mediawiki/files/logrotate.d_mediawiki_jobrunner
b/puppet/modules/mediawiki/files/logrotate.d_mediawiki_jobrunner
new file mode 100644
index 0000000..59dead4
--- /dev/null
+++ b/puppet/modules/mediawiki/files/logrotate.d_mediawiki_jobrunner
@@ -0,0 +1,13 @@
+# logrotate config for MediaWiki Jobrunner logs
+# This file is managed by Puppet
+/var/log/mediawiki/jobrunner.log {
+ daily
+ missingok
+ rotate 7
+ compress
+ notifempty
+ nocreate
+ postrotate
+ /sbin/restart jobrunner > /dev/null 2>&1
+ endscript
+}
diff --git a/puppet/modules/mediawiki/manifests/jobrunner.pp
b/puppet/modules/mediawiki/manifests/jobrunner.pp
index 5402424..58c1584 100644
--- a/puppet/modules/mediawiki/manifests/jobrunner.pp
+++ b/puppet/modules/mediawiki/manifests/jobrunner.pp
@@ -33,6 +33,13 @@
notify => Service['jobrunner'],
}
+ file { '/etc/logrotate.d/mediawiki_jobrunner':
+ source =>
'puppet:///modules/mediawiki/logrotate.d_mediawiki_jobrunner',
+ owner => 'root',
+ group => 'root',
+ mode => '0444',
+ }
+
service { 'jobrunner':
ensure => 'running',
provider => 'upstart',
--
To view, visit https://gerrit.wikimedia.org/r/147653
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I47823dc24c5e8c85cf70e841094b0bc04c750d73
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh <o...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
