DIY-pcap 0.2.6 → 0.2.7

data/lib/diy/controller.rb

@@ -27,8 +27,8 @@ module DIY
         pkts = @offline.nexts
         one_round( client, server, pkts )
         client, server = server, client
-        rescue HopePacketTimeoutError
-          DIY::Logger.warn( "Timeout: Hope packet is #{pkts[0].inspect} ")
+        rescue HopePacketTimeoutError, UserError, FFI::PCap::LibError => e
+          DIY::Logger.warn( "Timeout: Hope packet is #{pkts[0].inspect} ") if e.kind_of?(HopePacketTimeoutError)
           @fail_count += 1
           begin
           @offline.next_pcap
@@ -50,12 +50,22 @@ module DIY
     end
     
     def one_round( client, server, pkts )
+      @error_flag = nil
       @round_count = 0 unless @round_count
       @round_count += 1
-      DIY::Logger.info "round #{@round_count}: (c:#{client.__drburi} / s:#{server.__drburi}) #{pkts[0].inspect}:(size= #{pkts.size})"
+      DIY::Logger.info "round #{@round_count}: (c:#{client.__drburi} / s:#{server.__drburi}) #{pkts[0].inspect}:(queue= #{pkts.size})"
       server.ready do |recv_pkt|
+        next if @error_flag # error accur waiting other thread do with it
         recv_pkt = Packet.new(recv_pkt)
-        @strategy.call(pkts.first, recv_pkt, pkts)
+        begin
+          @strategy.call(pkts.first, recv_pkt, pkts)
+        rescue DIY::StrategyCallError =>e
+          DIY::Logger.warn("UserError Catch: " + e.inspect)
+          e.backtrace.each do |msg|
+            DIY::Logger.info(msg)
+          end
+          @error_flag = e
+        end
       end
       client_send(client, pkts)
       wait_recv_ok(pkts)
@@ -63,16 +73,26 @@ module DIY
     end
     
     def client_send(client, pkts)
-      if ! @before_send
-        client.inject(pkts)
-      else
+      if @before_send
         pkts = pkts.collect do |pkt| 
           content = pkt.content
-          pkt.content = @before_send.call(content)
+          begin
+            pkt.content = @before_send.call(content)
+          rescue Exception => e
+            DIY::Logger.warn("UserError Catch: " + error = BeforeSendCallError.new(e) )
+            error.backtrace.each do |msg|
+              DIY::Logger.info(msg)
+            end
+            raise error
+          end
           pkt
         end
-        
+      end
+      begin
         client.inject(pkts)
+      rescue FFI::PCap::LibError =>e
+        DIY::Logger.warn("SendPacketError Catch: " + e )
+        raise e
       end
     end
     
@@ -90,14 +110,19 @@ module DIY
     end
     
     def wait_recv_ok(pkts)
-      wait_until(@timeout ||= 10) { pkts.empty? }
+      wait_until(@timeout ||= 10) do
+        if @error_flag
+          raise @error_flag
+        end
+        pkts.empty?
+      end
     end
     
     def wait_until( timeout = 10, &block )
       Timeout.timeout(timeout, DIY::HopePacketTimeoutError.new("hope packet wait timeout after #{timeout} seconds") ) do
         loop do
           break if block.call
-          sleep 0.01
+          sleep 0.1
         end
       end
     end

data/lib/diy/exceptions.rb

@@ -12,4 +12,22 @@ module DIY
   # 不可能出现的报文出现
   class UnExpectPacketError < Error; end
   
+  class UserError < Error
+    def initialize(real_exception)
+      puts "new..."
+      @real_exception = real_exception
+      @name = real_exception.class
+      @message = real_exception.message
+      set_backtrace( Utils.filter_backtrace(real_exception) )
+    end
+    
+    def inspect
+      "#<#{self.class.name}: @real_exception=#{@name}, @real_msg=#{@message}>"
+    end
+  end
+  
+  # 策略执行异常
+  class StrategyCallError < UserError; end
+  # before_send 异常
+  class BeforeSendCallError < UserError; end
 end

data/lib/diy/strategy_builder.rb

@@ -30,8 +30,8 @@ module DIY
         begin
           ret = strategy.call(hope_pkt.content, recv_pkt.content, queue)
         rescue Exception => e
-          logger.error("user strategy exception: #{e.class} -> #{e.message}")
-          raise
+          #~ logger.error("user strategy exception: #{e.class} -> #{e.message}")
+          raise StrategyCallError.new(e)
         else
           if ret == Strategy::OK
             logger.info("pkt same:")

data/lib/diy/utils.rb

@@ -34,6 +34,28 @@ module DIY
           end
         end
       end
+      
+      def filter_backtrace(e) 
+        filter_ary = [ "/lib/diy/controller.rb", "/lib/diy/strategy_builder.rb" ]
+        new_bt = []
+        e.backtrace.each do |msg|
+          if ! Utils.ary_match(filter_ary, msg)
+           new_bt << msg
+          else
+            puts "break"
+            break
+          end
+        end
+        new_bt
+      end
+      
+      def ary_match(ary, msg)
+        ary.each do |e|
+          return true if /#{Regexp.escape(e)}/ === msg
+        end
+        nil
+      end
+      
     end
   end
 end

data/lib/diy/version.rb

@@ -1,5 +1,5 @@
 module DIY
   class PCAP
-    VERSION = "0.2.6"
+    VERSION = "0.2.7"
   end
 end

data/spec/controller_spec.rb

@@ -1,37 +0,0 @@
-require 'spec_helper'
-
-describe DIY::Builder do
-  
-  before(:each) do
-    @device_name = FFI::PCap.dump_devices[0][0]
-    DIY::Logger.info( "Initialize Live: #{@device_name}" )
-    @live = DIY::Live.new(@device_name)#FFI::PCap::Live.new(:dev=>@device_name, :handler => FFI::PCap::Handler, :promisc => true)
-    @live2 = DIY::Live.new(@device_name)#FFI::PCap::Live.new(:dev=>@device_name, :handler => FFI::PCap::Handler, :promisc => true)
-    
-    @curi = "druby://localhost:7878"
-    @suri = "druby://localhost:7879"
-    
-  end
-    
-  it "#run" do
-    # client create
-    Thread.abort_on_exception = true
-    client_t = Thread.new do
-      client = DIY::Worker.new(@live)
-      DIY::WorkerKeeper.new(client, @curi).run
-    end
-    
-    server_t = Thread.new do
-      server = DIY::Worker.new(@live2)
-      DIY::WorkerKeeper.new(server, @suri).run
-    end
-    
-    sleep 1
-    builder = DIY::Builder.new do
-      pcapfiles "helper/http.pcap"
-      use DIY::SimpleStrategy.new
-      timeout 10
-    end
-    builder.run
-  end
-end

data/spec/usererror_spec.rb

@@ -0,0 +1,85 @@
+require 'spec_helper'
+require 'diy/device_finder'
+
+def raise_me
+  raise "Error on me"
+end
+
+describe "Controller" do
+
+  before(:all) do
+    @device_name = DIY::DeviceFinder.smart_select
+    @live = DIY::Live.new(@device_name)
+    @live2 = DIY::Live.new(@device_name)
+    
+    @curi = "druby://localhost:7878"
+    @suri = "druby://localhost:7879"
+    
+    # client create
+    Thread.abort_on_exception = true
+    @client_t ||= Thread.new do
+      client = DIY::Worker.new(@live)
+      DIY::WorkerKeeper.new(client, @curi).run
+    end
+    
+    @server_t ||= Thread.new do
+      server = DIY::Worker.new(@live2)
+      DIY::WorkerKeeper.new(server, @suri).run
+    end    
+  end
+  
+  after(:all) do
+    @client_t.kill
+    @server_t.kill
+  end
+  
+  it "#run " do
+    sleep 1
+    builder = DIY::Builder.new do
+      pcapfiles "helper/http.pcap"
+      use DIY::SimpleStrategy.new
+      timeout 10
+    end
+    lambda { builder.run }.should_not raise_error  
+  end
+    
+  it "#run stragety error" do
+    
+    
+    wrongUserStragety = lambda {
+        raise_me
+        #~ raise "error one me"
+    }
+    
+    sleep 1
+    builder = DIY::Builder.new do
+      pcapfiles "helper/http.pcap"
+      use wrongUserStragety
+      timeout 10
+    end
+    lambda { builder.run }.should_not raise_error
+  end
+  
+  it "#run before_send error" do
+    sleep 1
+    build2 = DIY::Builder.new do
+      before_send do
+        raise "error on me"
+      end
+      pcapfiles "helper/http.pcap"
+    end
+    lambda { build2.run }.should_not raise_error
+  end
+  
+  it "#run big packet " do
+    sleep 1
+    build2 = DIY::Builder.new do
+      before_send do |pkt|
+        new_pkt = "a" * 10000
+      end
+      pcapfiles "helper/http.pcap"
+    end
+    lambda { build2.run }.should_not raise_error  
+  end
+
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 6
-  version: 0.2.6
+  - 7
+  version: 0.2.7
 platform: ruby
 authors: 
 - yafei Lee
@@ -141,6 +141,7 @@ files:
 - spec/mu_parser_spec.rb
 - spec/offline_spec.rb
 - spec/spec_helper.rb
+- spec/usererror_spec.rb
 - spec/utils_spec.rb
 - spec/worker_spec.rb
 has_rdoc: true