hq-sms-global-balance-check 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd135a8ba3ea2cfef393062bdd82c055abffbfae
-  data.tar.gz: 07f2c99c82e1c70944b0f8c68beaa17e0307e6de
+  metadata.gz: ac2884b718655062111084b5f841ce23c62bbfc0
+  data.tar.gz: 67f8bb1a7a52b4ec07ba2faeca8d327249815f80
 SHA512:
-  metadata.gz: 9e174f85e98b9ec5c78302eae4945c364932632b5c7361f0463edc82ddc31398738bd69247333b73d763d1a3d075bf25d97b9c601a3691169b2a1aa448221760
-  data.tar.gz: f200d1538c878e018bcb320e0e6213de614b50d83a4bda4aa909189eb1351c32846b4229e3a7808f9d8847db9ed62865c73a394661e8048fb61dfed1f15765a3
+  metadata.gz: 4c560444e4484a7bb35974f706b9a2f9bb0d7d9e05b60d593e40ed8ba2727c5c588c1f0ae774f7eb347982f0b6c4f35abf9f53edca3e1adbddcd51deac3ee639
+  data.tar.gz: 4ab8340f21425d5cb7eca5c68bc7cda601e5a32c7c09c2cc493439818c9212a8eba3cc6d4d24d159151d892691a0c69c13e5630a509b7ec76e8823a25dfe2a9f

data/features/basic.feature

@@ -16,6 +16,16 @@ Feature: Basic functionality
       --account account
       --warning 500
       --critical 100
+      --timeout 10
+      """
+
+    Given a file "timeout.args":
+      """
+      --config default.config
+      --account account
+      --warning 500
+      --critical 100
+      --timeout 0
       """
 
   Scenario: Balance ok
@@ -53,3 +63,15 @@ Feature: Basic functionality
       """
       SMS Global account CRITICAL: 50 credits (critical is 100)
       """
+
+  Scenario: Read timeout
+
+    Given the server is slow to respond
+
+    When I run the script with "timeout.args"
+
+    Then the status should be 3
+    And the output should be:
+      """
+      SMS Global account UNKNOWN: server timed out
+      """

data/features/cache.feature

@@ -21,6 +21,18 @@ Feature: Cached results
       --account account
       --warning 500
       --critical 100
+      --timeout 10
+      --cache-warning 10
+      --cache-critical 20
+      """
+
+    And a file "timeout.args":
+      """
+      --config default.config
+      --account account
+      --warning 500
+      --critical 100
+      --timeout 0
       --cache-warning 10
       --cache-critical 20
       """
@@ -41,7 +53,7 @@ Feature: Cached results
     Then the status should be 0
     And the output should be:
       """
-      SMS Global account OK: 750 credits, last check 5 seconds ago
+      SMS Global account OK: server status 500, 750 credits, last check 5 seconds ago
       """
 
   Scenario: Cache warning
@@ -54,7 +66,7 @@ Feature: Cached results
     Then the status should be 1
     And the output should be:
       """
-      SMS Global account WARNING: 750 credits, last check 15 seconds ago (warning is 10)
+      SMS Global account WARNING: server status 500, 750 credits, last check 15 seconds ago (warning is 10)
       """
 
   Scenario: Cache critical
@@ -67,5 +79,18 @@ Feature: Cached results
     Then the status should be 2
     And the output should be:
       """
-      SMS Global account CRITICAL: 750 credits, last check 25 seconds ago (critical is 20)
+      SMS Global account CRITICAL: server status 500, 750 credits, last check 25 seconds ago (critical is 20)
+      """
+
+  Scenario: Cache warning with timeout
+
+    Given the time is 115
+    And the server is slow to respond
+
+    When I run the script with "timeout.args"
+
+    Then the status should be 1
+    And the output should be:
+      """
+      SMS Global account WARNING: server timed out, 750 credits, last check 15 seconds ago (warning is 10)
       """

data/features/support/steps.rb

@@ -15,6 +15,12 @@ Given /^the server is offline$/ do
 
 end
 
+Given /^the server is slow to respond$/ do
+
+	$status = :slow
+
+end
+
 When /^I run the script with "(.+)"$/ do
 	|args_file|
 
@@ -37,3 +43,7 @@ Then /^the output should be:$/ do
 	|expected_output|
 	@script.stdout.string.strip.should == expected_output
 end
+
+Then /^show stderr$/ do
+	puts @script.stderr.string
+end

data/features/support/web-server.rb

@@ -44,6 +44,10 @@ $web_server.mount_proc "/balance-api.php" do
 
 			response.body = "Sorry, an error occurred"
 
+		when :slow
+
+			sleep 2
+
 	end
 
 end

data/lib/hq/sms-global/balance-check/script.rb

@@ -33,6 +33,10 @@ class Script < Tools::CheckScript
 					:convert => :to_f,
 					:required => true },
 
+				{ :name => :timeout,
+					:convert => :to_f,
+					:required => true },
+
 				{ :name => :cache_warning,
 					:convert => :to_i },
 
@@ -76,21 +80,16 @@ class Script < Tools::CheckScript
 
 	def perform_checks
 
-		used_cache = false
-
-		begin
-
-			get_balance_from_server
-
-		rescue => exception
-
-			raise exception \
-				unless @cache_elem
+		get_balance_from_server
 
+		if @actual_balance
+			used_cache = false
+		elsif @cache_elem
 			read_cache
-
+			@unknown = false
 			used_cache = true
-
+		else
+			return
 		end
 
 		# report balance
@@ -160,22 +159,42 @@ class Script < Tools::CheckScript
 				"password" => @account_elem["password"],
 			})
 
-		Net::HTTP.start url.host, url.port do
-			|http|
+		http =
+			Net::HTTP.new url.host, url.port
+
+		http.open_timeout = @opts[:timeout]
+		http.read_timeout = @opts[:timeout]
+
+		http.start
+
+		begin
 
 			request = Net::HTTP::Get.new "#{url.path}?#{url.query}"
 
 			response = http.request request
 
-			raise "Error 1" \
-				unless response.code == "200"
+			unless response.code == "200"
+				unknown "server status #{response.code}"
+				return
+			end
 
-			raise "Error 2" \
-				unless response.body =~ /^BALANCE: ([^;]+); USER: (.+)$/
+			unless response.body =~ /^BALANCE: ([^;]+); USER: (.+)$/
+				unknown "invalid server response"
+				return
+			end
 
 			@actual_balance =
 				$1.to_f
 
+		rescue Net::ReadTimeout
+
+			unknown "server timed out"
+			return
+
+		ensure
+
+			http.finish
+
 		end
 
 	end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hq-sms-global-balance-check
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - James Pharaoh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-14 00:00:00.000000000 Z
+date: 2013-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hq-tools
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: libxml-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.0.11
+        version: 0.0.18
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.0.11
+        version: 0.0.18
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement