my_stuff-fb303 0.0.6 → 0.0.7

data/lib/my_stuff/fb303/proxy_handler.rb

@@ -16,6 +16,23 @@ module MyStuff
         rescue => e
           @s.increment_counter "#{meth}.exception"
           @s.increment_counter "#{meth}.exception.#{e.class.name}"
+
+          if e.is_a? Thrift::Exception
+            # Presumably defined in the Thrift interface file
+            level = :warn
+          else
+            # Definitely not :(
+            level = :error
+          end
+
+          begin
+            # MyStuff::Logger exception, allowing us to specify the
+            # backtrace.
+            @s.logger.raw_log e.backtrace, level, e
+          rescue NoMethoderror
+            @s.logger.send level, e
+          end
+
           raise
         end
       end

data/lib/my_stuff/fb303/resilient_processor.rb

@@ -0,0 +1,63 @@
+# Copyright 2011-present Fred Emmott. See COPYING file.
+
+# Monkey-patch Thrift::Processor to not completely bail on undefined
+# exceptions.
+
+module MyStuff
+  module Fb303
+    module ResilientProcessor
+      class SpyIProt
+        def initialize iprot
+          @iprot = iprot
+          @mode = :capture
+        end
+
+        def read_message_begin
+          case @mode
+          when :capture
+            @header = @iprot.read_message_begin
+            @mode = :replay
+            @header
+          when :replay
+            @mode = :normal
+            @header
+          when :normal
+            @iprot.read_message_begin
+          else
+            raise "Reached a bad state: %s" % @mode
+          end
+        end
+
+        def method_missing *args
+          @iprot.send *args
+        end
+      end
+
+      def resilient_process iprot, oprot
+        spy = SpyIProt.new(iprot)
+        name, type, seqid = spy.read_message_begin
+
+        begin
+          unresilient_process(spy, oprot)
+        rescue => e
+          ae = Thrift::ApplicationException.new(
+            Thrift::ApplicationException::UNKNOWN,
+            e.inspect
+          )
+          oprot.write_message_begin(name, Thrift::MessageTypes::EXCEPTION, seqid)
+          ae.write oprot
+          oprot.write_message_end
+          oprot.trans.flush
+          false
+        end
+      end
+
+      def self.extended other
+        class <<other
+          alias :unresilient_process :process
+          alias :process :resilient_process
+        end
+      end
+    end
+  end
+end

data/lib/my_stuff/fb303/server.rb

@@ -57,8 +57,12 @@ module MyStuff
       end
 
       def method_missing *args
+        unless self.getStatus == Fb_status::ALIVE
+          raise 'Handler unavailable in current status.'
+        end
+
         if self.handler != self
-          self.handler.send *args
+            self.handler.send *args
         else
           super *args
         end

metadata

@@ -1,62 +1,79 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: my_stuff-fb303
-version: !ruby/object:Gem::Version
-  version: 0.0.6
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 7
+  version: 0.0.7
 platform: ruby
-authors:
+authors: 
 - Fred Emmott
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-04 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2011-09-04 00:00:00 +01:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: thrift
-  requirement: &70167224791480 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
   prerelease: false
-  version_requirements: *70167224791480
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id001
 description: Basic implementation of fb303 for Ruby services
-email:
+email: 
 - mail@fredemmott.co.uk
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - COPYING
 - README.rdoc
 - lib/my_stuff/fb303/proxy_handler.rb
+- lib/my_stuff/fb303/resilient_processor.rb
 - lib/my_stuff/fb303/server.rb
 - lib/my_stuff/fb303_server.rb
+has_rdoc: true
 homepage: https://github.com/fredemmott/my_stuff-fb303
-licenses:
+licenses: 
 - ISC
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: MyStuff.ws's Ruby fb303 implementation
 test_files: []
+