Dduvall has uploaded a new change for review.
https://gerrit.wikimedia.org/r/146157
Change subject: Don't execute middleware in non-mwv environments
......................................................................
Don't execute middleware in non-mwv environments
Change-Id: Ifd67fc9e8be94e52df97091055d15f00d1443ac4
Bug: 67974
---
M lib/mediawiki-vagrant/environment.rb
M lib/mediawiki-vagrant/middleware.rb
2 files changed, 12 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/57/146157/1
diff --git a/lib/mediawiki-vagrant/environment.rb
b/lib/mediawiki-vagrant/environment.rb
index 8c6b5af..1de28ab 100644
--- a/lib/mediawiki-vagrant/environment.rb
+++ b/lib/mediawiki-vagrant/environment.rb
@@ -78,6 +78,13 @@
end
end
+ # Whether this is a valid MediaWiki-Vagrant environment. This should
+ # be used as a guard in middleware.
+ #
+ def valid?
+ path('lib/mediawiki-vagrant.rb').exist?
+ end
+
private
def manifest_path(*subpaths)
diff --git a/lib/mediawiki-vagrant/middleware.rb
b/lib/mediawiki-vagrant/middleware.rb
index bd3c743..fe3b674 100644
--- a/lib/mediawiki-vagrant/middleware.rb
+++ b/lib/mediawiki-vagrant/middleware.rb
@@ -8,8 +8,11 @@
end
def call(env)
- @mwv.prune_roles
- $FACTER['provider_name'] = env[:machine].provider_name
+ if @mwv.valid?
+ @mwv.prune_roles
+ $FACTER['provider_name'] = env[:machine].provider_name
+ end
+
@app.call(env)
end
end
--
To view, visit https://gerrit.wikimedia.org/r/146157
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifd67fc9e8be94e52df97091055d15f00d1443ac4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Dduvall <dduv...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
