Skip to content

Commit 9597a0a

Browse files
authored
Rebase for DataDog#292 - fixes HOSTNAME_EXTRACTION_REGEX reinit (DataDog#310)
* [gitignore] Gemfile.lock, ignore thy. * Fixing 'already initialized constant' warnings
1 parent c048e8b commit 9597a0a

2 files changed

Lines changed: 4 additions & 3 deletions

File tree

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ spec/fixtures
33
.rspec_system
44
.bundle
55
vendor
6+
Gemfile.lock

lib/puppet/reports/datadog_reports.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
API_KEY = config[:datadog_api_key]
1616

1717
# if need be initialize the regex
18-
HOSTNAME_EXTRACTION_REGEX = config[:hostname_extraction_regex]
18+
HOSTNAME_REGEX = config[:hostname_extraction_regex]
1919
begin
20-
HOSTNAME_EXTRACTION_REGEX = Regexp.new HOSTNAME_EXTRACTION_REGEX unless HOSTNAME_EXTRACTION_REGEX.nil?
20+
HOSTNAME_EXTRACTION_REGEX = Regexp.new HOSTNAME_REGEX unless HOSTNAME_REGEX.nil?
2121
rescue
22-
raise(Puppet::ParseError, "Invalid hostname_extraction_regex #{HOSTNAME_EXTRACTION_REGEX}")
22+
raise(Puppet::ParseError, "Invalid hostname_extraction_regex #{HOSTNAME_REGEX}")
2323
end
2424

2525
desc <<-DESC

0 commit comments

Comments
 (0)