Yuvipanda has submitted this change and it was merged.
Change subject: labs: More fixups to htpyaml hiera backend
......................................................................
labs: More fixups to htpyaml hiera backend
Debugging this is such a fucking pain in the ass
Change-Id: Ibeb8da0444d596586160ed3c5ad2179dc689792c
---
M modules/wmflib/lib/hiera/backend/httpyaml_backend.rb
1 file changed, 3 insertions(+), 3 deletions(-)
Approvals:
Yuvipanda: Verified; Looks good to me, approved
diff --git a/modules/wmflib/lib/hiera/backend/httpyaml_backend.rb
b/modules/wmflib/lib/hiera/backend/httpyaml_backend.rb
index 33702b9..fae9f51 100644
--- a/modules/wmflib/lib/hiera/backend/httpyaml_backend.rb
+++ b/modules/wmflib/lib/hiera/backend/httpyaml_backend.rb
@@ -2,8 +2,8 @@
class Hiera
module Backend
class Httpyaml_backend
- def initialize(cache=nil)
- @cache = cache || Httpcache.new
+ def initialize
+ @cache = Httpcache.new
end
def lookup(key, scope, order_override, resolution_type)
@@ -16,7 +16,7 @@
# in any other case.
next unless source.start_with?('httpyaml/') && source.length >
'httpyaml/'.length
- data = @cache.read(source, Hash, {})
+ data = @cache.read(source)
next if data.nil? || data.empty?
next unless data.include?(key)
--
To view, visit https://gerrit.wikimedia.org/r/310676
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibeb8da0444d596586160ed3c5ad2179dc689792c
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <yuvipa...@wikimedia.org>
Gerrit-Reviewer: Yuvipanda <yuvipa...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
