monitoring-client 0.2.5 → 0.2.6

data/bin/monitor-system-info

@@ -91,7 +91,7 @@ module Monitoring
       ].each do |expected_key|
         unless @config.has_key?(expected_key) &&
             !@config[expected_key].nil? &&
-            !@config[expected_key].size > 0
+            @config[expected_key].size > 0
           die("Bad config at #{@config_fn}: "\
               "Expected #{expected_key} to exist and not be blank")
         end

data/bin/monitoringd

@@ -163,9 +163,7 @@ module Monitoring
     end
     
     def post_samples(uri, samples)
-      Timeout.timeout(3) do
-        generic_http_post(uri, "/api/samples", nil, nil, { "samples" => samples.to_json })
-      end
+      generic_http_post(uri, "/api/samples", nil, nil, 3, { "samples" => samples.to_json })
     rescue Timeout::Error => e
       STDOUT.puts("Could not post sample (will requeue): " + samples.inspect()) rescue nil
       STDERR.puts([[e.class.name, e.message].join(": "),
@@ -177,8 +175,10 @@ module Monitoring
                    e.backtrace.join("\n")].join("\n")) rescue nil
     end
 
-    def generic_http_post(uri, path, user, pass, post_params={}, &block)
+    def generic_http_post(uri, path, user, pass, timeout, post_params={}, &block)
       http = Net::HTTP.new(uri.host, uri.port)
+      http.open_timeout = timeout
+      http.read_timeout = timeout
       http.use_ssl = uri.is_a?(URI::HTTPS)
       req = Net::HTTP::Post.new(path)
       req.set_form_data(post_params)

data/lib/monitoring/client/version.rb

@@ -1,5 +1,5 @@
 module Monitoring
   module Client
-    VERSION = "0.2.5"
+    VERSION = "0.2.6"
   end
 end

metadata

@@ -1,62 +1,48 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: monitoring-client
-version: !ruby/object:Gem::Version 
-  hash: 29
+version: !ruby/object:Gem::Version
+  version: 0.2.6
   prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 5
-  version: 0.2.5
 platform: ruby
-authors: 
+authors:
 - Marc Bowes
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-30 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-09-17 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: json
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &11494580 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *11494580
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &11493980 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-description: Ruby client which uses UDP to communicate with a daemon which uses HTTP POST to communicate with a Web server
-email: 
+  prerelease: false
+  version_requirements: *11493980
+description: Ruby client which uses UDP to communicate with a daemon which uses HTTP
+  POST to communicate with a Web server
+email:
 - marcbowes+monitoring+client@gmail.com
-executables: 
+executables:
 - monitor-system-info
 - monitoringd
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - Gemfile.lock
@@ -75,42 +61,28 @@ files:
 - spec/config_spec.rb
 - spec/profiler_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://rubygems.org/gems/monitoring-client
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: monitoring-client
-rubygems_version: 1.6.2
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Simple client & daemon to post metrics
-test_files: 
-- spec/compiler_spec.rb
-- spec/config_spec.rb
-- spec/profiler_spec.rb
-- spec/spec_helper.rb
+test_files: []