[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: Remove bunyan from Parsoid settings

2016-08-31 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Remove bunyan from Parsoid settings
..


Remove bunyan from Parsoid settings

Change-Id: Ice4f58ec3fa6c895e063c9ba2e136dec426959d9
---
M puppet/modules/parsoid/templates/localsettings.js.erb
1 file changed, 0 insertions(+), 23 deletions(-)

Approvals:
  Sbisson: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/puppet/modules/parsoid/templates/localsettings.js.erb 
b/puppet/modules/parsoid/templates/localsettings.js.erb
index b95d086..47f15b2 100644
--- a/puppet/modules/parsoid/templates/localsettings.js.erb
+++ b/puppet/modules/parsoid/templates/localsettings.js.erb
@@ -14,27 +14,4 @@
 <%- if @allow_cors -%>
 parsoidConfig.allowCORS = '<%= @allow_cors %>';
 <%- end %>
-
-// Direct logs to logstash via bunyan and gelf-stream.
-// To enable Logstash on MediaWiki-Vagrant:
-//   vagrant roles enable elk; vagrant provision
-//
-// See `vagrant roles info elk` for more information.
-parsoidConfig.loggerBackend = {
-  name: ':Logger.bunyan/BunyanLogger',
-  options: {
-name: 'parsoid',
-streams: [
-  {
-path: '<%= @log_file %>',
-level: '<%= @loglev %>'
-  },
-  {
-type: 'raw',
-stream: require('gelf-stream').forBunyan('127.0.0.1', 12201),
-level: '<%= @loglev %>'
-  }
-]
-  }
-};
 };

-- 
To view, visit https://gerrit.wikimedia.org/r/307661
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ice4f58ec3fa6c895e063c9ba2e136dec426959d9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Dduvall 
Gerrit-Reviewer: Mooeypoo 
Gerrit-Reviewer: Sbisson 
Gerrit-Reviewer: Subramanya Sastry 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: Remove bunyan from Parsoid settings

2016-08-30 Thread Mattflaschen (Code Review) 
Mattflaschen has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/307661

Change subject: Remove bunyan from Parsoid settings
..

Remove bunyan from Parsoid settings

Change-Id: Ice4f58ec3fa6c895e063c9ba2e136dec426959d9
---
M puppet/modules/parsoid/templates/localsettings.js.erb
1 file changed, 0 insertions(+), 23 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/61/307661/1

diff --git a/puppet/modules/parsoid/templates/localsettings.js.erb 
b/puppet/modules/parsoid/templates/localsettings.js.erb
index b95d086..47f15b2 100644
--- a/puppet/modules/parsoid/templates/localsettings.js.erb
+++ b/puppet/modules/parsoid/templates/localsettings.js.erb
@@ -14,27 +14,4 @@
 <%- if @allow_cors -%>
 parsoidConfig.allowCORS = '<%= @allow_cors %>';
 <%- end %>
-
-// Direct logs to logstash via bunyan and gelf-stream.
-// To enable Logstash on MediaWiki-Vagrant:
-//   vagrant roles enable elk; vagrant provision
-//
-// See `vagrant roles info elk` for more information.
-parsoidConfig.loggerBackend = {
-  name: ':Logger.bunyan/BunyanLogger',
-  options: {
-name: 'parsoid',
-streams: [
-  {
-path: '<%= @log_file %>',
-level: '<%= @loglev %>'
-  },
-  {
-type: 'raw',
-stream: require('gelf-stream').forBunyan('127.0.0.1', 12201),
-level: '<%= @loglev %>'
-  }
-]
-  }
-};
 };

-- 
To view, visit https://gerrit.wikimedia.org/r/307661
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ice4f58ec3fa6c895e063c9ba2e136dec426959d9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits