Last active
August 29, 2015 14:20
-
-
Save wwest4/845975c919d7438a5688 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/Gemfile.lock b/Gemfile.lock | |
index 37e10ff..8e69f06 100644 | |
--- a/Gemfile.lock | |
+++ b/Gemfile.lock | |
@@ -1,7 +1,7 @@ | |
PATH | |
remote: . | |
specs: | |
- circactivator (2.0.1) | |
+ circactivator (2.1.0) | |
httparty (~> 0.13.3) | |
mixlib-log (~> 1.6.0) | |
settingslogic (~> 2.0.9) | |
diff --git a/lib/circactivator/checkupdater.rb b/lib/circactivator/checkupdater.rb | |
index a99ea47..bb22f00 100644 | |
--- a/lib/circactivator/checkupdater.rb | |
+++ b/lib/circactivator/checkupdater.rb | |
@@ -53,8 +53,9 @@ module CircActivator | |
end | |
def call_circonus(method, url, options={}) | |
+ | |
options[:headers] = http_headers | |
- options[:verify] = CircActivator::Config.circonus['verify'] || true | |
+ options[:verify] = verify | |
attempt = 0 | |
begin | |
@@ -112,5 +113,10 @@ module CircActivator | |
def attempts | |
CircActivator::Config.circonus['attempts'] || 3 | |
end | |
+ | |
+ def verify | |
+ opt = CircActivator::Config.circonus['verify'] | |
+ opt.nil? ? true : opt | |
+ end | |
end | |
end | |
diff --git a/log/circactivator.log b/log/circactivator.log | |
new file mode 100644 | |
index 0000000..e69de29 | |
diff --git a/spec/support/fixtures/config/config.yml b/spec/support/fixtures/config/config.yml | |
index 6d9da70..3350050 100644 | |
--- a/spec/support/fixtures/config/config.yml | |
+++ b/spec/support/fixtures/config/config.yml | |
@@ -1,5 +1,5 @@ | |
log: | |
- file: /Users/adam/tmp/circactivator.log | |
+ file: log/circactivator.log | |
level: debug | |
count: 7 | |
@@ -11,7 +11,7 @@ circonus: | |
attempts: 3 | |
monitoring: | |
- error_file: /Users/adam/tmp/circactivator.err | |
+ error_file: log/circactivator.err | |
check_bundles: | |
iad1-prod: | |
@@ -19,4 +19,4 @@ check_bundles: | |
2: api-web | |
iad1-nonprod: | |
3: .* | |
- 4: .* | |
\ No newline at end of file | |
+ 4: .* |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment