pulse-meter 0.4.2 → 0.4.3

data/lib/cmd.rb

@@ -157,5 +157,15 @@ module Cmd
       end
     end
 
+    desc "udp_proxy HOST PORT", "Start UDP proxy for sensor data"
+    common_options
+    def udp_proxy(host, port)
+      with_redis do
+        puts 'Starting UDP server'
+        server = PulseMeter::UDPServer.new(host, port)
+        server.start
+      end
+    end
+
   end
 end

data/lib/pulse-meter.rb

@@ -10,6 +10,9 @@ require "pulse-meter/sensor/configuration"
 
 require "pulse-meter/command_aggregator/async"
 require "pulse-meter/command_aggregator/sync"
+require "pulse-meter/command_aggregator/udp"
+
+require "pulse-meter/udp_server"
 
 module PulseMeter
   @@redis = nil
@@ -37,7 +40,7 @@ module PulseMeter
     @@command_aggregator = case command_aggregator
       when :sync; PulseMeter::CommandAggregator::Sync.instance
       when :async; PulseMeter::CommandAggregator::Async.instance
-      else raise ArgumentError
+      else command_aggregator
     end
   end
 

data/lib/pulse-meter/command_aggregator/udp.rb

@@ -0,0 +1,42 @@
+require 'socket'
+
+module PulseMeter
+  module CommandAggregator
+    class UDP
+
+      def initialize(host, port)
+        @host, @port = host, port
+        @buffer = []
+        @in_multi = false
+      end
+
+      def multi
+        @in_multi = true
+        yield
+      ensure
+        @in_multi = false
+        send_buffer
+      end
+
+      def method_missing(*args)
+        @buffer << args
+        send_buffer unless @in_multi
+      end
+
+      private
+
+      def send_buffer
+        data = @buffer.to_json
+        sock = UDPSocket.new
+        sock.send(data, 0, @host, @port)
+        sock.close
+      rescue StandardError
+        PulseMeter.error "error sending data: #{e}, #{e.backtrace.join("\n")}"
+      ensure
+        @buffer = []
+      end
+
+    end
+  end
+end
+

data/lib/pulse-meter/udp_server.rb

@@ -0,0 +1,43 @@
+require 'socket'
+require 'timeout'
+
+module PulseMeter
+  class UDPServer
+    MAX_PACKET = 1024
+  
+    def initialize(host, port)
+      @socket = UDPSocket.new
+      @socket.do_not_reverse_lookup = true
+      @socket.bind(host, port)
+    end
+
+    def start(max_packets = nil)
+      while true do
+        if max_packets
+          break if max_packets <= 0
+          max_packets -= 1
+        end
+        process_packet
+      end
+    end
+
+    private
+
+    def process_packet
+      raw_data, _ = @socket.recvfrom(MAX_PACKET)
+      data = parse_data(raw_data)
+      data.each do |command|
+        PulseMeter.redis.send(*command)
+      end
+    rescue StandardError => e
+      PulseMeter.error "Error processing packet: #{e}"
+    end
+
+    def parse_data(data)
+      JSON.parse(data)
+    rescue
+      PulseMeter.error "Bad redis data: #{data.inspect}"
+      []
+    end
+  end
+end

data/lib/pulse-meter/version.rb

@@ -1,3 +1,3 @@
 module PulseMeter
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

data/spec/pulse_meter/command_aggregator/udp_spec.rb

@@ -0,0 +1,38 @@
+require 'spec_helper'
+
+describe PulseMeter::CommandAggregator::UDP do
+  let(:host){'127.0.0.1'}
+  let(:port){33333}
+  let(:udp_sock){mock(:socket)}
+  before do 
+    UDPSocket.stub!(:new).and_return(udp_sock)
+    udp_sock.stub!(:close).and_return(nil)
+    @ca = described_class.new(host, port)
+  end
+
+  describe "#multi" do
+    it "should accumulate redis commands and send them in a bulk" do
+      data = [
+        ["set", "xxxx", "zzzz"],
+        ["set", "yyyy", "zzzz"]
+      ].to_json
+      udp_sock.should_receive(:send).with(data, 0, host, port).and_return(0)
+      @ca.multi do
+        @ca.set("xxxx", "zzzz")
+        @ca.set("yyyy", "zzzz")
+      end
+    end
+  end
+
+  describe "any other redis instance method" do
+    it "should send data imediately" do
+      data = [
+        ["set", "xxxx", "zzzz"]
+      ].to_json
+      udp_sock.should_receive(:send).with(data, 0, host, port).and_return(0)
+      @ca.set("xxxx", "zzzz")
+    end
+  end
+
+end
+

data/spec/pulse_meter/udp_server_spec.rb

@@ -0,0 +1,36 @@
+require 'spec_helper'
+
+describe PulseMeter::UDPServer do
+  let(:host){'127.0.0.1'}
+  let(:port){33333}
+  let(:udp_sock){mock(:socket)}
+  let(:redis){PulseMeter.redis}
+  before do 
+    UDPSocket.should_receive(:new).and_return(udp_sock)
+    udp_sock.should_receive(:bind).with(host, port).and_return(nil)
+    udp_sock.should_receive("do_not_reverse_lookup=").with(true).and_return(nil)
+    @server = described_class.new(host, port)
+  end
+
+  describe "#start" do
+    let(:data){
+      [
+        ["set", "xxxx", "zzzz"],
+        ["set", "yyyy", "zzzz"]
+      ].to_json
+    }
+    it "should process proper incoming commands" do
+      udp_sock.should_receive(:recvfrom).with(described_class::MAX_PACKET).and_return(data)
+      @server.start(1)
+      redis.get("xxxx").should == "zzzz"
+      redis.get("yyyy").should == "zzzz"
+    end
+
+    it "should suppress JSON errors" do
+      udp_sock.should_receive(:recvfrom).with(described_class::MAX_PACKET).and_return("xxx")
+      expect{ @server.start(1) }.not_to raise_exception
+    end
+  end
+
+end
+

data/spec/pulse_meter_spec.rb

@@ -27,8 +27,9 @@ describe PulseMeter do
       end
     end
     context "otherwise" do
-      it "should raise ArgumentError" do
-        expect{ PulseMeter.command_aggregator = :xxx }.to raise_exception(ArgumentError)
+      it "should set command_aggregator to the passed value" do
+        PulseMeter.command_aggregator = :xxx
+        PulseMeter.command_aggregator.should == :xxx
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pulse-meter
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-02 00:00:00.000000000 Z
+date: 2013-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gon-sinatra
@@ -415,6 +415,7 @@ files:
 - lib/pulse-meter.rb
 - lib/pulse-meter/command_aggregator/async.rb
 - lib/pulse-meter/command_aggregator/sync.rb
+- lib/pulse-meter/command_aggregator/udp.rb
 - lib/pulse-meter/extensions/enumerable.rb
 - lib/pulse-meter/mixins/cmd.rb
 - lib/pulse-meter/mixins/dumper.rb
@@ -447,6 +448,7 @@ files:
 - lib/pulse-meter/server/command_line_options.rb
 - lib/pulse-meter/server/config_options.rb
 - lib/pulse-meter/server/sensors.rb
+- lib/pulse-meter/udp_server.rb
 - lib/pulse-meter/version.rb
 - lib/pulse-meter/visualize/app.rb
 - lib/pulse-meter/visualize/base.rb
@@ -537,6 +539,7 @@ files:
 - pulse-meter.gemspec
 - spec/pulse_meter/command_aggregator/async_spec.rb
 - spec/pulse_meter/command_aggregator/sync_spec.rb
+- spec/pulse_meter/command_aggregator/udp_spec.rb
 - spec/pulse_meter/extensions/enumerable_spec.rb
 - spec/pulse_meter/mixins/cmd_spec.rb
 - spec/pulse_meter/mixins/dumper_spec.rb
@@ -562,6 +565,7 @@ files:
 - spec/pulse_meter/sensor/timelined/percentile_spec.rb
 - spec/pulse_meter/sensor/timelined/uniq_counter_spec.rb
 - spec/pulse_meter/sensor/uniq_counter_spec.rb
+- spec/pulse_meter/udp_server_spec.rb
 - spec/pulse_meter/visualize/app_spec.rb
 - spec/pulse_meter/visualize/dsl/layout_spec.rb
 - spec/pulse_meter/visualize/dsl/page_spec.rb
@@ -607,9 +611,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1795310197501122422
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -620,6 +621,7 @@ summary: Lightweight Redis-based metrics aggregator and processor with CLI and s
 test_files:
 - spec/pulse_meter/command_aggregator/async_spec.rb
 - spec/pulse_meter/command_aggregator/sync_spec.rb
+- spec/pulse_meter/command_aggregator/udp_spec.rb
 - spec/pulse_meter/extensions/enumerable_spec.rb
 - spec/pulse_meter/mixins/cmd_spec.rb
 - spec/pulse_meter/mixins/dumper_spec.rb
@@ -645,6 +647,7 @@ test_files:
 - spec/pulse_meter/sensor/timelined/percentile_spec.rb
 - spec/pulse_meter/sensor/timelined/uniq_counter_spec.rb
 - spec/pulse_meter/sensor/uniq_counter_spec.rb
+- spec/pulse_meter/udp_server_spec.rb
 - spec/pulse_meter/visualize/app_spec.rb
 - spec/pulse_meter/visualize/dsl/layout_spec.rb
 - spec/pulse_meter/visualize/dsl/page_spec.rb