ArielGlenn has submitted this change and it was merged.
Change subject: Revert "Gerrit: Have log4j re-read its configuration every 60
seconds"
......................................................................
Revert "Gerrit: Have log4j re-read its configuration every 60 seconds"
monitorInterval isn't reliable.
This reverts commit 939eb2cb39b03a3006a2ae51480764bae5a60211.
Change-Id: I817293da668d8df97a087854404227265097be85
---
M modules/gerrit/manifests/jetty.pp
M modules/gerrit/templates/log4j.properties.erb
2 files changed, 2 insertions(+), 3 deletions(-)
Approvals:
ArielGlenn: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/gerrit/manifests/jetty.pp
b/modules/gerrit/manifests/jetty.pp
index f1ba464..d195b5a 100644
--- a/modules/gerrit/manifests/jetty.pp
+++ b/modules/gerrit/manifests/jetty.pp
@@ -155,7 +155,8 @@
ensure => running,
subscribe => [
File['/var/lib/gerrit2/review_site/etc/gerrit.config'],
- File['/var/lib/gerrit2/review_site/etc/secure.config']
+ File['/var/lib/gerrit2/review_site/etc/secure.config'],
+ File['/var/lib/gerrit2/review_site/etc/log4j.properties']
],
enable => true,
hasstatus => false,
diff --git a/modules/gerrit/templates/log4j.properties.erb
b/modules/gerrit/templates/log4j.properties.erb
index 948d27a..2f1b556 100644
--- a/modules/gerrit/templates/log4j.properties.erb
+++ b/modules/gerrit/templates/log4j.properties.erb
@@ -13,8 +13,6 @@
# limitations under the License.
#
-monitorInterval=60
-
log4j.rootLogger=DEBUG, error_log
log4j.logger.com.google.gerrit.sshd.SshLog=DEBUG, sshd_log
log4j.logger.com.google.gerrit.pgm.http.jetty.HttpLog=DEBUG, httpd_log
--
To view, visit https://gerrit.wikimedia.org/r/317845
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I817293da668d8df97a087854404227265097be85
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Chad <[email protected]>
Gerrit-Reviewer: ArielGlenn <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
