Chad has uploaded a new change for review.
https://gerrit.wikimedia.org/r/317845
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(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/45/317845/1
diff --git a/modules/gerrit/manifests/jetty.pp
b/modules/gerrit/manifests/jetty.pp
index 9f35328..93b7952 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 7e24cdc..54b0b95 100644
--- a/modules/gerrit/templates/log4j.properties.erb
+++ b/modules/gerrit/templates/log4j.properties.erb
@@ -12,9 +12,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-
-monitorInterval=60
-
log4j.rootCategory=INFO, stderr
log4j.appender.stderr=org.apache.log4j.ConsoleAppender
log4j.appender.stderr.target=System.err
--
To view, visit https://gerrit.wikimedia.org/r/317845
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I817293da668d8df97a087854404227265097be85
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Chad <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
