Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/154253
Change subject: HHVM: use syslog; route to fluorine
......................................................................
HHVM: use syslog; route to fluorine
* Configure HHVM to use syslog for logging.
* Add HHVM to MediaWiki's rsyslog.conf.
This leaves the file path and description of the rsyslog config file somewhat
misnamed (since it's no longer Apache specific), but I'll clean that up in
another patch.
Change-Id: I4590fdcf1738d7c839098580858d4bd42098fc47
---
M modules/hhvm/manifests/init.pp
M modules/mediawiki/templates/apache/rsyslog.conf.erb
2 files changed, 7 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/53/154253/1
diff --git a/modules/hhvm/manifests/init.pp b/modules/hhvm/manifests/init.pp
index f1acea9..f9a56b4 100644
--- a/modules/hhvm/manifests/init.pp
+++ b/modules/hhvm/manifests/init.pp
@@ -78,6 +78,7 @@
resource_limit => { core_file_size => to_bytes('8 Gb') },
log => {
header => true,
+ use_syslog => true,
level => 'Error',
native_stack_trace => true,
},
diff --git a/modules/mediawiki/templates/apache/rsyslog.conf.erb
b/modules/mediawiki/templates/apache/rsyslog.conf.erb
index a8e72f3..fa62426 100644
--- a/modules/mediawiki/templates/apache/rsyslog.conf.erb
+++ b/modules/mediawiki/templates/apache/rsyslog.conf.erb
@@ -15,3 +15,9 @@
# Discard apache2 messages before they get to 50-default.conf
& ~
+
+# Send HHVM messages to the MediaWiki log aggregator
+:programname,isequal,"hhvm" @<%= @apache_log_aggregator %>;MediaWiki
+
+# Discard HHVM messages before they get to 50-default.conf
+& ~
--
To view, visit https://gerrit.wikimedia.org/r/154253
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4590fdcf1738d7c839098580858d4bd42098fc47
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
