Ottomata has submitted this change and it was merged.
Change subject: Restart jmxtrans when purging log files
......................................................................
Restart jmxtrans when purging log files
Change-Id: Ie7084c4e3a317a76d6ccb3040a0eab6ba0d20a30
---
M manifests/init.pp
1 file changed, 7 insertions(+), 6 deletions(-)
Approvals:
Ottomata: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/init.pp b/manifests/init.pp
index 0cada01..8065c7b 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -39,12 +39,13 @@
# propertly rotate files until we have a version
# of jmxtrans where this is fixed. Remove all jmxtrans
# logs for now. We don't really need these anyway.
- # jmxtrans will function fine if its open log
- # file is removed.
- exec { 'jmxtrans-log-purge':
- command => '/bin/rm /var/log/jmxtrans/*.log*',
- user => 'jmxtrans',
- onlyif => '/usr/bin/dpkg -s jmxtrans | grep -q "Version: 250"',
+ cron { 'jmxtrans-log-purge':
+ # This is so awful. The version of jmxtrans we have now
+ # seems to not respond to 'service jmxtrans stop'.
+ command => '/usr/bin/dpkg -s jmxtrans | /bin/grep -q "Version: 250" &&
(/usr/bin/pkill -f "/usr/bin/java.+jmxtrans-all.jar" && sleep 6; /bin/rm -r
/var/log/jmxtrans/*.log*; /usr/sbin/service jmxtrans start)',
+ minute => 0,
+ hour => 0,
+ user => 'root',
require => Service['jmxtrans'],
}
}
--
To view, visit https://gerrit.wikimedia.org/r/220474
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie7084c4e3a317a76d6ccb3040a0eab6ba0d20a30
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet/jmxtrans
Gerrit-Branch: master
Gerrit-Owner: Ottomata <[email protected]>
Gerrit-Reviewer: Ottomata <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
