event-shipper 0.2.2 → 0.2.3

data/README

@@ -26,6 +26,10 @@ To run a local example installation, start redis. Then:
   # Receive entries and store in redis
   $ ./bin/esproxy -c configs/proxy.yaml
 
+STATUS
+
+Stable in production for Ruby 1.9.3 and later.
+
 PERFORMANCE
 
 Good. 

data/lib/event_shipper/proxy.rb

@@ -10,38 +10,54 @@ module EventShipper
   class Proxy < Clamp::Command
 
     option %w(-c --config), "FILE", "Location of the configuration file."
+    option %w(-v --verbose), :flag, "Prints all events before forwarding them."
 
     def execute
       fail "Please specify a configuration file to use on the command line. (--config)" \
         unless config
 
-      configuration = YAML.load_file(config)
+      configure_with YAML.load_file(config)
 
-      listen = configuration['listen']
-      host, port = listen['host'], listen['port']
-      transport = UDP.new(host, port)
+      begin
+        trap('SIGINFO') { puts transport.stats }
+      rescue ArgumentError
+        # unsupported signal SIGINFO
+      end
+
+      main_loop
+    end
+
+    def main_loop
+      transport.dispatch { |queue, message| 
+        handle_message queue, message }
+    end
+    def handle_message queue, message
+      puts message if verbose?
+      redis.lpush queue, message
+    end
+
+    attr_reader :host, :port
+    attr_reader :listen
+    attr_reader :userdb
+    attr_reader :redis
+    attr_reader :transport
+
+    def configure_with configuration
+      @listen = configuration['listen']
+      @host, @port = listen['host'], listen['port']
+      @transport = UDP.new(host, port)
 
       if configuration['encrypt']
         users = configuration['users']
-        userdb = Hash[users.map { |str| str.split('/') }]
+        @userdb = Hash[users.map { |str| str.partition('/').values_at(0,2) }]
 
         transport.wrap Filter::Decrypt.new(userdb)
       end
 
       redis_config = configuration['redis']
-      redis = Redis.new(
+      @redis = Redis.new(
         host: redis_config['host'], 
         port: redis_config['port'])
-
-      begin
-        trap('SIGINFO') { puts transport.stats }
-      rescue ArgumentError
-        # unsupported signal SIGINFO
-      end
-
-      transport.dispatch { |queue, message| 
-        # puts message }
-        redis.lpush queue, message }
     end
   end
 end

data/lib/event_shipper/udp.rb

@@ -19,6 +19,10 @@ module EventShipper
       @stats = Stats.new      
     end
 
+    def close
+      @socket.close
+    end
+
     def wrap filter
       @filters << filter
     end
@@ -27,7 +31,7 @@ module EventShipper
       @filters.inject(obj) { |o, f| f.en(o) }
     end
     def decode obj
-      @filters.reverse.inject(obj) { |o, f| f.de(o) }
+      @filters.reverse.inject([obj, {}]) { |o, f| f.de(*o) }
     end
 
     # Sends messages via UDP to a central proxy. Using the queue argument, the
@@ -67,7 +71,7 @@ module EventShipper
       loop do
         datagram, source_info = @socket.recvfrom(10 * 1024)
 
-        handle_message(datagram)
+        handle_message(datagram, &Proc.new)
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: event-shipper
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-24 00:00:00.000000000 Z
+date: 2013-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis