monitoring-client 0.2.6 → 0.2.7

data/Gemfile.lock

@@ -1,14 +1,13 @@
 PATH
   remote: .
   specs:
-    monitoring-client (0.2.3)
-      json
+    monitoring-client (0.2.6)
+      yajl-ruby
 
 GEM
   remote: http://rubygems.org/
   specs:
     diff-lcs (1.1.3)
-    json (1.5.3)
     rspec (2.6.0)
       rspec-core (~> 2.6.0)
       rspec-expectations (~> 2.6.0)
@@ -17,6 +16,7 @@ GEM
     rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.6.0)
+    yajl-ruby (0.8.3)
 
 PLATFORMS
   ruby

data/bin/monitoringd

@@ -6,7 +6,7 @@ module Monitoring
     require "optparse"
     require "thread"
     require "socket"
-    require "json"
+    require "yajl"
     require "net/https"
     require "uri"
     require "timeout"
@@ -151,7 +151,7 @@ module Monitoring
       while @alive
         begin
           line = socket.gets()
-          JSON.parse(line).each do |sample|
+          json_parse(line).each do |sample|
             @samples.push(sample)
           end
         rescue StandardError => e
@@ -163,7 +163,7 @@ module Monitoring
     end
     
     def post_samples(uri, samples)
-      generic_http_post(uri, "/api/samples", nil, nil, 3, { "samples" => samples.to_json })
+      generic_http_post(uri, "/api/samples", nil, nil, 3, { "samples" => json_encode(samples) })
     rescue Timeout::Error => e
       STDOUT.puts("Could not post sample (will requeue): " + samples.inspect()) rescue nil
       STDERR.puts([[e.class.name, e.message].join(": "),
@@ -193,6 +193,14 @@ module Monitoring
         resp.body
       end
     end
+
+    def json_parse(what)
+      Yajl::Parser.parse(what)
+    end
+    
+    def json_encode(what)
+      Yajl::Encoder.encode(what)
+    end
     
   end
 end

data/lib/monitoring/client/profiler.rb

@@ -2,7 +2,7 @@ module Monitoring
   module Client
     class Profiler
 
-      require "json"
+      require "yajl"
       require "socket"
       require "monitoring/client/config"
       require "monitoring/client/compiler"
@@ -30,10 +30,14 @@ module Monitoring
       end
 
       def post_metrics(compiled)
-        UDPSocket.new().send(compiled.to_json + "\n",
+        UDPSocket.new().send(json_encode(compiled) + "\n",
                              0, "localhost", 57475)
       end
 
+      def json_encode(what)
+        Yajl::Encoder.encode(what)
+      end
+
       def default_decorations
         {
           :hostname => config.hostname,

data/lib/monitoring/client/version.rb

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

data/monitoring-client.gemspec

@@ -19,6 +19,6 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
   
-  s.add_runtime_dependency "json"
+  s.add_runtime_dependency "yajl-ruby"
   s.add_development_dependency "rspec"
 end

metadata

@@ -1,48 +1,62 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: monitoring-client
-version: !ruby/object:Gem::Version
-  version: 0.2.6
+version: !ruby/object:Gem::Version 
+  hash: 25
   prerelease: 
+  segments: 
+  - 0
+  - 2
+  - 7
+  version: 0.2.7
 platform: ruby
-authors:
+authors: 
 - Marc Bowes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-17 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: &11494580 !ruby/object:Gem::Requirement
+
+date: 2011-09-24 00:00:00 +02:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: yajl-ruby
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *11494580
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &11493980 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  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:
+  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: 
 - marcbowes+monitoring+client@gmail.com
-executables:
+executables: 
 - monitor-system-info
 - monitoringd
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - Gemfile
 - Gemfile.lock
@@ -61,28 +75,39 @@ 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
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: monitoring-client
-rubygems_version: 1.8.5
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Simple client & daemon to post metrics
 test_files: []
+